From 28f28705612902c15cd0702cc891fba35bf2d2df Mon Sep 17 00:00:00 2001 From: darco Date: Tue, 19 Apr 2005 23:09:21 +0000 Subject: [PATCH] moreupdates git-svn-id: http://svn.voria.com/code@23 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/Makefile.am | 10 +- synfig-core/trunk/config/configure.ac | 40 ++--- synfig-core/trunk/config/doxygen.cfg.in | 4 +- synfig-core/trunk/config/pkgconfig.pc.in | 4 +- synfig-core/trunk/src/Makefile.am | 4 +- synfig-core/trunk/src/modules/Makefile.am | 6 +- synfig-core/trunk/src/modules/example/Makefile.am | 6 +- .../trunk/src/modules/example/filledrect.cpp | 32 ++-- synfig-core/trunk/src/modules/example/filledrect.h | 40 ++--- synfig-core/trunk/src/modules/example/main.cpp | 12 +- .../trunk/src/modules/example/metaballs.cpp | 34 ++-- synfig-core/trunk/src/modules/example/metaballs.h | 38 ++--- .../trunk/src/modules/example/simplecircle.cpp | 36 ++--- .../trunk/src/modules/example/simplecircle.h | 36 ++--- .../trunk/src/modules/lyr_freetype/Makefile.am | 6 +- .../src/modules/lyr_freetype/lyr_freetype.cpp | 60 +++---- .../trunk/src/modules/lyr_freetype/lyr_freetype.h | 50 +++--- .../trunk/src/modules/lyr_freetype/main.cpp | 12 +- synfig-core/trunk/src/modules/lyr_std/Makefile.am | 6 +- synfig-core/trunk/src/modules/lyr_std/bevel.cpp | 36 ++--- synfig-core/trunk/src/modules/lyr_std/bevel.h | 40 ++--- .../trunk/src/modules/lyr_std/booleancurve.cpp | 22 +-- .../trunk/src/modules/lyr_std/booleancurve.h | 16 +- synfig-core/trunk/src/modules/lyr_std/clamp.cpp | 32 ++-- synfig-core/trunk/src/modules/lyr_std/clamp.h | 16 +- synfig-core/trunk/src/modules/lyr_std/import.cpp | 44 +++--- synfig-core/trunk/src/modules/lyr_std/import.h | 34 ++-- .../trunk/src/modules/lyr_std/insideout.cpp | 40 ++--- synfig-core/trunk/src/modules/lyr_std/insideout.h | 20 +-- synfig-core/trunk/src/modules/lyr_std/julia.cpp | 30 ++-- synfig-core/trunk/src/modules/lyr_std/julia.h | 34 ++-- synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh | 4 +- synfig-core/trunk/src/modules/lyr_std/main.cpp | 10 +- .../trunk/src/modules/lyr_std/mandelbrot.cpp | 30 ++-- synfig-core/trunk/src/modules/lyr_std/mandelbrot.h | 18 +-- .../trunk/src/modules/lyr_std/radialgradient.cpp | 38 ++--- synfig-core/trunk/src/modules/lyr_std/rotate.cpp | 44 +++--- synfig-core/trunk/src/modules/lyr_std/rotate.h | 24 +-- synfig-core/trunk/src/modules/lyr_std/shade.cpp | 38 ++--- synfig-core/trunk/src/modules/lyr_std/shade.h | 28 ++-- .../trunk/src/modules/lyr_std/sphere_distort.cpp | 72 ++++----- .../trunk/src/modules/lyr_std/sphere_distort.h | 24 +-- synfig-core/trunk/src/modules/lyr_std/stretch.cpp | 44 +++--- synfig-core/trunk/src/modules/lyr_std/stretch.h | 22 +-- .../trunk/src/modules/lyr_std/supersample.cpp | 36 ++--- .../trunk/src/modules/lyr_std/supersample.h | 18 +-- synfig-core/trunk/src/modules/lyr_std/timeloop.cpp | 26 ++-- synfig-core/trunk/src/modules/lyr_std/timeloop.h | 32 ++-- .../trunk/src/modules/lyr_std/translate.cpp | 42 ++--- synfig-core/trunk/src/modules/lyr_std/translate.h | 24 +-- synfig-core/trunk/src/modules/lyr_std/twirl.cpp | 46 +++--- synfig-core/trunk/src/modules/lyr_std/twirl.h | 42 ++--- synfig-core/trunk/src/modules/lyr_std/warp.cpp | 50 +++--- synfig-core/trunk/src/modules/lyr_std/warp.h | 30 ++-- .../trunk/src/modules/lyr_std/xorpattern.cpp | 30 ++-- synfig-core/trunk/src/modules/lyr_std/xorpattern.h | 18 +-- synfig-core/trunk/src/modules/lyr_std/zoom.cpp | 44 +++--- synfig-core/trunk/src/modules/lyr_std/zoom.h | 22 +-- synfig-core/trunk/src/modules/mod_bmp/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_bmp/main.cpp | 10 +- synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp | 44 +++--- synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h | 20 +-- synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp | 26 ++-- synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.h | 26 ++-- synfig-core/trunk/src/modules/mod_dv/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_dv/main.cpp | 8 +- synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp | 20 +-- synfig-core/trunk/src/modules/mod_dv/trgt_dv.h | 24 +-- .../trunk/src/modules/mod_ffmpeg/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_ffmpeg/main.cpp | 8 +- .../trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp | 16 +- .../trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h | 20 +-- .../trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp | 20 +-- .../trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.h | 24 +-- .../trunk/src/modules/mod_filter/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_filter/blur.cpp | 36 ++--- synfig-core/trunk/src/modules/mod_filter/blur.h | 26 ++-- .../trunk/src/modules/mod_filter/colorcorrect.cpp | 32 ++-- .../trunk/src/modules/mod_filter/colorcorrect.h | 22 +-- .../trunk/src/modules/mod_filter/halftone.cpp | 6 +- .../trunk/src/modules/mod_filter/halftone.h | 20 +-- .../trunk/src/modules/mod_filter/halftone2.cpp | 42 ++--- .../trunk/src/modules/mod_filter/halftone2.h | 40 ++--- .../trunk/src/modules/mod_filter/halftone3.cpp | 42 ++--- .../trunk/src/modules/mod_filter/halftone3.h | 40 ++--- .../trunk/src/modules/mod_filter/lumakey.cpp | 38 ++--- synfig-core/trunk/src/modules/mod_filter/lumakey.h | 28 ++-- synfig-core/trunk/src/modules/mod_filter/main.cpp | 12 +- .../trunk/src/modules/mod_filter/radialblur.cpp | 32 ++-- .../trunk/src/modules/mod_filter/radialblur.h | 20 +-- .../trunk/src/modules/mod_geometry/Makefile.am | 6 +- .../src/modules/mod_geometry/checkerboard.cpp | 42 ++--- .../trunk/src/modules/mod_geometry/checkerboard.h | 34 ++-- .../trunk/src/modules/mod_geometry/circle.cpp | 38 ++--- .../trunk/src/modules/mod_geometry/circle.h | 32 ++-- .../trunk/src/modules/mod_geometry/main.cpp | 12 +- .../trunk/src/modules/mod_geometry/outline.cpp | 48 +++--- .../trunk/src/modules/mod_geometry/outline.h | 30 ++-- .../trunk/src/modules/mod_geometry/rectangle.cpp | 38 ++--- .../trunk/src/modules/mod_geometry/rectangle.h | 40 ++--- .../trunk/src/modules/mod_geometry/region.cpp | 42 ++--- .../trunk/src/modules/mod_geometry/region.h | 24 +-- .../trunk/src/modules/mod_geometry/star.cpp | 32 ++-- synfig-core/trunk/src/modules/mod_geometry/star.h | 16 +- synfig-core/trunk/src/modules/mod_gif/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_gif/main.cpp | 8 +- synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp | 24 +-- synfig-core/trunk/src/modules/mod_gif/trgt_gif.h | 38 ++--- .../trunk/src/modules/mod_gradient/Makefile.am | 6 +- .../src/modules/mod_gradient/conicalgradient.cpp | 40 ++--- .../src/modules/mod_gradient/conicalgradient.h | 42 ++--- .../src/modules/mod_gradient/curvegradient.cpp | 54 +++---- .../trunk/src/modules/mod_gradient/curvegradient.h | 26 ++-- .../src/modules/mod_gradient/lineargradient.cpp | 36 ++--- .../src/modules/mod_gradient/lineargradient.h | 22 +-- .../trunk/src/modules/mod_gradient/main.cpp | 12 +- .../src/modules/mod_gradient/radialgradient.cpp | 38 ++--- .../src/modules/mod_gradient/radialgradient.h | 40 ++--- .../src/modules/mod_gradient/spiralgradient.cpp | 38 ++--- .../src/modules/mod_gradient/spiralgradient.h | 44 +++--- .../trunk/src/modules/mod_imagemagick/Makefile.am | 6 +- .../trunk/src/modules/mod_imagemagick/main.cpp | 8 +- .../modules/mod_imagemagick/mptr_imagemagick.cpp | 40 ++--- .../src/modules/mod_imagemagick/mptr_imagemagick.h | 20 +-- .../modules/mod_imagemagick/trgt_imagemagick.cpp | 20 +-- .../src/modules/mod_imagemagick/trgt_imagemagick.h | 26 ++-- synfig-core/trunk/src/modules/mod_jpeg/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_jpeg/main.cpp | 8 +- .../trunk/src/modules/mod_jpeg/mptr_jpeg.cpp | 26 ++-- synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h | 22 +-- .../trunk/src/modules/mod_jpeg/trgt_jpeg.cpp | 18 +-- synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.h | 24 +-- .../trunk/src/modules/mod_libavcodec/Makefile.am | 6 +- .../trunk/src/modules/mod_libavcodec/main.cpp | 10 +- .../trunk/src/modules/mod_libavcodec/mptr.cpp | 22 +-- .../trunk/src/modules/mod_libavcodec/mptr.h | 20 +-- .../trunk/src/modules/mod_libavcodec/trgt_av.cpp | 64 ++++---- .../trunk/src/modules/mod_libavcodec/trgt_av.h | 26 ++-- .../trunk/src/modules/mod_noise/Makefile.am | 6 +- .../trunk/src/modules/mod_noise/distort.cpp | 42 ++--- synfig-core/trunk/src/modules/mod_noise/distort.h | 48 +++--- synfig-core/trunk/src/modules/mod_noise/main.cpp | 14 +- synfig-core/trunk/src/modules/mod_noise/noise.cpp | 42 ++--- synfig-core/trunk/src/modules/mod_noise/noise.h | 48 +++--- synfig-core/trunk/src/modules/mod_noise/random.cpp | 2 +- synfig-core/trunk/src/modules/mod_noise/random.h | 6 +- .../trunk/src/modules/mod_openexr/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_openexr/main.cpp | 6 +- .../trunk/src/modules/mod_openexr/mptr_openexr.cpp | 20 +-- .../trunk/src/modules/mod_openexr/mptr_openexr.h | 18 +-- .../trunk/src/modules/mod_openexr/trgt_openexr.cpp | 20 +-- .../trunk/src/modules/mod_openexr/trgt_openexr.h | 26 ++-- .../trunk/src/modules/mod_particle/Makefile.am | 6 +- .../trunk/src/modules/mod_particle/main.cpp | 12 +- .../trunk/src/modules/mod_particle/plant.cpp | 50 +++--- synfig-core/trunk/src/modules/mod_particle/plant.h | 62 ++++---- .../trunk/src/modules/mod_particle/random.cpp | 2 +- .../trunk/src/modules/mod_particle/random.h | 6 +- synfig-core/trunk/src/modules/mod_png/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_png/main.cpp | 8 +- synfig-core/trunk/src/modules/mod_png/mptr_png.cpp | 34 ++-- synfig-core/trunk/src/modules/mod_png/mptr_png.h | 22 +-- synfig-core/trunk/src/modules/mod_png/trgt_png.cpp | 30 ++-- synfig-core/trunk/src/modules/mod_png/trgt_png.h | 24 +-- synfig-core/trunk/src/modules/mod_ppm/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_ppm/main.cpp | 8 +- synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp | 26 ++-- synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h | 18 +-- synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.cpp | 8 +- synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.h | 20 +-- synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp | 20 +-- synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.h | 28 ++-- .../trunk/src/modules/mod_yuv420p/Makefile.am | 6 +- synfig-core/trunk/src/modules/mod_yuv420p/main.cpp | 8 +- .../trunk/src/modules/mod_yuv420p/trgt_yuv.cpp | 18 +-- .../trunk/src/modules/mod_yuv420p/trgt_yuv.h | 30 ++-- .../trunk/src/modules/mptr_mplayer/Makefile.am | 4 +- .../trunk/src/modules/mptr_mplayer/main.cpp | 8 +- .../src/modules/mptr_mplayer/mptr_mplayer.cpp | 18 +-- .../trunk/src/modules/mptr_mplayer/mptr_mplayer.h | 14 +- synfig-core/trunk/src/synfig/Makefile.am | 20 +-- synfig-core/trunk/src/synfig/activepoint.cpp | 6 +- synfig-core/trunk/src/synfig/activepoint.h | 10 +- synfig-core/trunk/src/synfig/angle.h | 10 +- synfig-core/trunk/src/synfig/blinepoint.cpp | 6 +- synfig-core/trunk/src/synfig/blinepoint.h | 10 +- synfig-core/trunk/src/synfig/blur.cpp | 34 ++-- synfig-core/trunk/src/synfig/blur.h | 38 ++--- synfig-core/trunk/src/synfig/canvas.cpp | 58 +++---- synfig-core/trunk/src/synfig/canvas.h | 20 +-- synfig-core/trunk/src/synfig/canvasbase.h | 10 +- synfig-core/trunk/src/synfig/color.cpp | 4 +- synfig-core/trunk/src/synfig/color.h | 14 +- synfig-core/trunk/src/synfig/context.cpp | 40 ++--- synfig-core/trunk/src/synfig/context.h | 10 +- synfig-core/trunk/src/synfig/curve_helper.cpp | 12 +- synfig-core/trunk/src/synfig/curve_helper.h | 8 +- synfig-core/trunk/src/synfig/curveset.cpp | 6 +- synfig-core/trunk/src/synfig/curveset.h | 8 +- synfig-core/trunk/src/synfig/distance.cpp | 38 ++--- synfig-core/trunk/src/synfig/distance.h | 22 +-- synfig-core/trunk/src/synfig/exception.cpp | 20 +-- synfig-core/trunk/src/synfig/exception.h | 10 +- synfig-core/trunk/src/synfig/gamma.cpp | 4 +- synfig-core/trunk/src/synfig/gamma.h | 10 +- synfig-core/trunk/src/synfig/general.h | 22 +-- synfig-core/trunk/src/synfig/gradient.cpp | 48 +++--- synfig-core/trunk/src/synfig/gradient.h | 10 +- synfig-core/trunk/src/synfig/guid.cpp | 22 +-- synfig-core/trunk/src/synfig/guid.h | 8 +- synfig-core/trunk/src/synfig/guidset.h | 12 +- synfig-core/trunk/src/synfig/importer.cpp | 18 +-- synfig-core/trunk/src/synfig/importer.h | 22 +-- synfig-core/trunk/src/synfig/interpolation.h | 10 +- synfig-core/trunk/src/synfig/keyframe.cpp | 16 +- synfig-core/trunk/src/synfig/keyframe.h | 10 +- synfig-core/trunk/src/synfig/layer.cpp | 34 ++-- synfig-core/trunk/src/synfig/layer.h | 26 ++-- synfig-core/trunk/src/synfig/layer_bitmap.cpp | 28 ++-- synfig-core/trunk/src/synfig/layer_bitmap.h | 12 +- synfig-core/trunk/src/synfig/layer_composite.cpp | 6 +- synfig-core/trunk/src/synfig/layer_composite.h | 10 +- synfig-core/trunk/src/synfig/layer_mime.cpp | 4 +- synfig-core/trunk/src/synfig/layer_mime.h | 10 +- synfig-core/trunk/src/synfig/layer_motionblur.cpp | 16 +- synfig-core/trunk/src/synfig/layer_motionblur.h | 16 +- synfig-core/trunk/src/synfig/layer_pastecanvas.cpp | 34 ++-- synfig-core/trunk/src/synfig/layer_pastecanvas.h | 26 ++-- synfig-core/trunk/src/synfig/layer_polygon.cpp | 16 +- synfig-core/trunk/src/synfig/layer_polygon.h | 14 +- synfig-core/trunk/src/synfig/layer_shape.cpp | 34 ++-- synfig-core/trunk/src/synfig/layer_shape.h | 16 +- synfig-core/trunk/src/synfig/layer_solidcolor.cpp | 20 +-- synfig-core/trunk/src/synfig/layer_solidcolor.h | 16 +- synfig-core/trunk/src/synfig/listimporter.cpp | 14 +- synfig-core/trunk/src/synfig/listimporter.h | 10 +- synfig-core/trunk/src/synfig/loadcanvas.cpp | 72 ++++----- synfig-core/trunk/src/synfig/loadcanvas.h | 16 +- synfig-core/trunk/src/synfig/main.cpp | 84 +++++----- synfig-core/trunk/src/synfig/main.h | 14 +- synfig-core/trunk/src/synfig/module.cpp | 24 +-- synfig-core/trunk/src/synfig/module.h | 44 +++--- synfig-core/trunk/src/synfig/mutex.cpp | 4 +- synfig-core/trunk/src/synfig/mutex.h | 10 +- synfig-core/trunk/src/synfig/node.cpp | 10 +- synfig-core/trunk/src/synfig/node.h | 16 +- synfig-core/trunk/src/synfig/palette.cpp | 10 +- synfig-core/trunk/src/synfig/palette.h | 14 +- synfig-core/trunk/src/synfig/paramdesc.cpp | 6 +- synfig-core/trunk/src/synfig/paramdesc.h | 12 +- synfig-core/trunk/src/synfig/pch.h | 8 +- synfig-core/trunk/src/synfig/polynomial_root.cpp | 4 +- synfig-core/trunk/src/synfig/polynomial_root.h | 6 +- synfig-core/trunk/src/synfig/proto/nodebase.px | 10 +- synfig-core/trunk/src/synfig/protocol.h | 14 +- synfig-core/trunk/src/synfig/real.h | 12 +- synfig-core/trunk/src/synfig/rect.cpp | 4 +- synfig-core/trunk/src/synfig/rect.h | 10 +- synfig-core/trunk/src/synfig/renddesc.cpp | 4 +- synfig-core/trunk/src/synfig/renddesc.h | 10 +- synfig-core/trunk/src/synfig/render.cpp | 12 +- synfig-core/trunk/src/synfig/render.h | 10 +- synfig-core/trunk/src/synfig/savecanvas.cpp | 24 +-- synfig-core/trunk/src/synfig/savecanvas.h | 10 +- synfig-core/trunk/src/synfig/segment.h | 10 +- synfig-core/trunk/src/synfig/sinfg.h | 137 ---------------- synfig-core/trunk/src/synfig/sinfg.nsh | 19 --- synfig-core/trunk/src/synfig/smartfile.h | 10 +- synfig-core/trunk/src/synfig/string.h | 10 +- synfig-core/trunk/src/synfig/string_decl.h | 10 +- synfig-core/trunk/src/synfig/surface.cpp | 24 +-- synfig-core/trunk/src/synfig/surface.h | 10 +- synfig-core/trunk/src/synfig/surfacenew.cpp | 4 +- synfig-core/trunk/src/synfig/surfacenew.h | 10 +- synfig-core/trunk/src/synfig/synfig.h | 137 ++++++++++++++++ synfig-core/trunk/src/synfig/synfig.nsh | 19 +++ synfig-core/trunk/src/synfig/target.cpp | 24 +-- synfig-core/trunk/src/synfig/target.h | 22 +-- synfig-core/trunk/src/synfig/target_multi.cpp | 6 +- synfig-core/trunk/src/synfig/target_multi.h | 12 +- synfig-core/trunk/src/synfig/target_null.cpp | 4 +- synfig-core/trunk/src/synfig/target_null.h | 10 +- synfig-core/trunk/src/synfig/target_null_tile.cpp | 4 +- synfig-core/trunk/src/synfig/target_null_tile.h | 12 +- synfig-core/trunk/src/synfig/target_scanline.cpp | 40 ++--- synfig-core/trunk/src/synfig/target_scanline.h | 12 +- synfig-core/trunk/src/synfig/target_tile.cpp | 40 ++--- synfig-core/trunk/src/synfig/target_tile.h | 12 +- synfig-core/trunk/src/synfig/time.cpp | 12 +- synfig-core/trunk/src/synfig/time.h | 18 +-- synfig-core/trunk/src/synfig/timepointcollect.cpp | 8 +- synfig-core/trunk/src/synfig/timepointcollect.h | 10 +- synfig-core/trunk/src/synfig/transform.cpp | 34 ++-- synfig-core/trunk/src/synfig/transform.h | 26 ++-- synfig-core/trunk/src/synfig/types.h | 8 +- synfig-core/trunk/src/synfig/uniqueid.cpp | 6 +- synfig-core/trunk/src/synfig/uniqueid.h | 10 +- synfig-core/trunk/src/synfig/value.cpp | 6 +- synfig-core/trunk/src/synfig/value.h | 14 +- synfig-core/trunk/src/synfig/valuenode.cpp | 16 +- synfig-core/trunk/src/synfig/valuenode.h | 14 +- .../trunk/src/synfig/valuenode_animated.cpp | 22 +-- synfig-core/trunk/src/synfig/valuenode_animated.h | 14 +- synfig-core/trunk/src/synfig/valuenode_bline.cpp | 22 +-- synfig-core/trunk/src/synfig/valuenode_bline.h | 12 +- .../trunk/src/synfig/valuenode_composite.cpp | 12 +- synfig-core/trunk/src/synfig/valuenode_composite.h | 14 +- synfig-core/trunk/src/synfig/valuenode_const.cpp | 4 +- synfig-core/trunk/src/synfig/valuenode_const.h | 10 +- .../trunk/src/synfig/valuenode_dynamiclist.cpp | 40 ++--- .../trunk/src/synfig/valuenode_dynamiclist.h | 20 +-- .../trunk/src/synfig/valuenode_gradientrotate.cpp | 20 +-- .../trunk/src/synfig/valuenode_gradientrotate.h | 14 +- synfig-core/trunk/src/synfig/valuenode_linear.cpp | 4 +- synfig-core/trunk/src/synfig/valuenode_linear.h | 14 +- .../trunk/src/synfig/valuenode_radialcomposite.cpp | 12 +- .../trunk/src/synfig/valuenode_radialcomposite.h | 14 +- .../trunk/src/synfig/valuenode_reference.cpp | 4 +- synfig-core/trunk/src/synfig/valuenode_reference.h | 12 +- synfig-core/trunk/src/synfig/valuenode_scale.cpp | 14 +- synfig-core/trunk/src/synfig/valuenode_scale.h | 14 +- .../trunk/src/synfig/valuenode_segcalctangent.cpp | 4 +- .../trunk/src/synfig/valuenode_segcalctangent.h | 14 +- .../trunk/src/synfig/valuenode_segcalcvertex.cpp | 4 +- .../trunk/src/synfig/valuenode_segcalcvertex.h | 14 +- synfig-core/trunk/src/synfig/valuenode_sine.cpp | 4 +- synfig-core/trunk/src/synfig/valuenode_sine.h | 14 +- synfig-core/trunk/src/synfig/valuenode_stripes.cpp | 22 +-- synfig-core/trunk/src/synfig/valuenode_stripes.h | 14 +- .../trunk/src/synfig/valuenode_subtract.cpp | 26 ++-- synfig-core/trunk/src/synfig/valuenode_subtract.h | 14 +- .../trunk/src/synfig/valuenode_timedswap.cpp | 10 +- synfig-core/trunk/src/synfig/valuenode_timedswap.h | 14 +- synfig-core/trunk/src/synfig/valuenode_twotone.cpp | 18 +-- synfig-core/trunk/src/synfig/valuenode_twotone.h | 14 +- synfig-core/trunk/src/synfig/vector.h | 22 +-- synfig-core/trunk/src/synfig/version.h | 28 ++-- synfig-core/trunk/src/synfig/waypoint.cpp | 6 +- synfig-core/trunk/src/synfig/waypoint.h | 12 +- synfig-core/trunk/src/template.cpp | 4 +- synfig-core/trunk/src/template.h | 6 +- synfig-core/trunk/src/tool/Makefile.am | 6 +- synfig-core/trunk/src/tool/main.cpp | 172 ++++++++++----------- synfig-core/trunk/src/tool/tool.nsh | 4 +- synfig-core/trunk/synfig-config.in | 6 +- synfig-core/trunk/synfig.pbproj/config.h | 4 +- synfig-core/trunk/synfig.pbproj/doxygen.cfg | 6 +- synfig-core/trunk/synfig.pc.in | 10 +- synfig-core/trunk/win32inst.nsi.in | 10 +- 349 files changed, 3743 insertions(+), 3741 deletions(-) delete mode 100644 synfig-core/trunk/src/synfig/sinfg.h delete mode 100644 synfig-core/trunk/src/synfig/sinfg.nsh create mode 100644 synfig-core/trunk/src/synfig/synfig.h create mode 100644 synfig-core/trunk/src/synfig/synfig.nsh diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am index 2346db2..928c23c 100644 --- a/synfig-core/trunk/Makefile.am +++ b/synfig-core/trunk/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/Makefile.am,v 1.5 2005/03/24 21:07:24 darco Exp $ +# $Header: /opt/voria/cvs/synfig/Makefile.am,v 1.5 2005/03/24 21:07:24 darco Exp $ #AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2 AUTOMAKE_OPTIONS=dist-zip dist-shar @@ -12,9 +12,9 @@ SUBDIRS=libltdl src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = @PACKAGE_TARNAME@.pc -bin_SCRIPTS=sinfg-config +bin_SCRIPTS=synfig-config -EXTRA_DIST=bootstrap config/depcomp config/sinfg.m4 config/cxx_macros.m4 sinfg.pbproj/config.h sinfg.pbproj/project.pbxproj @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg sinfg.kdevprj sinfg-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in config/pkgconfig.m4 config/libxml++.m4 @PACKAGE_TARNAME@.pc.in +EXTRA_DIST=bootstrap config/depcomp config/synfig.m4 config/cxx_macros.m4 synfig.pbproj/config.h synfig.pbproj/project.pbxproj @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg synfig.kdevprj synfig-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in config/pkgconfig.m4 config/libxml++.m4 @PACKAGE_TARNAME@.pc.in CVS=cvs @@ -78,7 +78,7 @@ listwritemes: -@echo install-bin: - make -C src/sinfg install-libLTLIBRARIES + make -C src/synfig install-libLTLIBRARIES win32inst.nsi: $(srcdir)/win32inst.nsi.in ./config.status win32inst.nsi @@ -110,7 +110,7 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC touch .doc_stamp benchmark: - sinfg -b -t null -q --time 0 $(srcdir)/examples/*.sif + synfig -b -t null -q --time 0 $(srcdir)/examples/*.sif html: .doc_stamp diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index f683639..34760e1 100644 --- a/synfig-core/trunk/config/configure.ac +++ b/synfig-core/trunk/config/configure.ac @@ -1,4 +1,4 @@ -i# $Header: /opt/voria/cvs/sinfg/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $ +i# $Header: /opt/voria/cvs/synfig/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $ # -- I N I T -------------------------------------------------- @@ -129,7 +129,7 @@ AC_ARG_ENABLE(layer-profiling,[ use_layerprofiling="no" ]) if test $use_layerprofiling = "yes" ; then { - AC_DEFINE(SINFG_PROFILE_LAYERS,[1],[enable layer profiling]) + AC_DEFINE(SYNFIG_PROFILE_LAYERS,[1],[enable layer profiling]) } ; fi @@ -359,11 +359,11 @@ dnl ]) -MODULE_DIR='${libdir}/sinfg/modules' -moduledir=$libdir/sinfg/modules +MODULE_DIR='${libdir}/synfig/modules' +moduledir=$libdir/synfig/modules AC_SUBST(MODULE_DIR) -SINFGLIB_DIR=$libdir/sinfg -AC_SUBST(SINFGLIB_DIR) +SYNFIGLIB_DIR=$libdir/synfig +AC_SUBST(SYNFIGLIB_DIR) @@ -453,28 +453,28 @@ AC_SUBST(VERSION_REV) dnl AC_CONFIG_SUBDIRS(libltdl) -CONFIG_LIBS="-lsinfg" +CONFIG_LIBS="-lsynfig" CONFIG_CFLAGS="$CONFIG_CFLAGS" AC_SUBST(CONFIG_LIBS) AC_SUBST(CONFIG_CFLAGS) AC_SUBST(CONFIG_DEPS) AC_SUBST(ETL_CFLAGS) -SINFG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $OPENEXR_LIBS $LIBSIGC_LIBS" -SINFG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $OPENEXR_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSINFG_NO_DEPRECATED" +SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $OPENEXR_LIBS $LIBSIGC_LIBS" +SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $OPENEXR_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED" CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`" -SINFG_CFLAGS="`echo $SINFG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`" -SINFG_LIBS="`echo $SINFG_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`" +SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`" +SYNFIG_LIBS="`echo $SYNFIG_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`" AC_SUBST(LIBADD_DL) -AC_SUBST(SINFG_LIBS) -AC_SUBST(SINFG_CFLAGS) +AC_SUBST(SYNFIG_LIBS) +AC_SUBST(SYNFIG_CFLAGS) AC_SUBST(API_VERSION) -sinfgincludedir=$includedir/sinfg-@API_VERSION@ -AC_SUBST(sinfgincludedir) +synfigincludedir=$includedir/synfig-@API_VERSION@ +AC_SUBST(synfigincludedir) [( [ -d libltdl ] || mkdir libltdl; @@ -488,11 +488,11 @@ AC_SUBST(sinfgincludedir) )] AC_OUTPUT( -sinfg-config +synfig-config @PACKAGE_TARNAME@.pc Makefile src/Makefile -src/sinfg/Makefile +src/synfig/Makefile src/modules/Makefile src/modules/example/Makefile src/modules/mod_filter/Makefile @@ -514,7 +514,7 @@ src/modules/mod_libavcodec/Makefile src/modules/mod_yuv420p/Makefile src/modules/mod_particle/Makefile src/tool/Makefile -src/modules/sinfg_modules.cfg +src/modules/synfig_modules.cfg win32inst.nsi pkg-info/macosx/synfig-core.info dnl src/modules/trgt_mpg/Makefile @@ -553,10 +553,10 @@ Using OpenEXR's \"half\" type ------> $use_openexr_half "'$'"CXX ------------------------------> '$CXX' "'$'"CXXFLAGS -------------------------> '$CXXFLAGS' -"'$'"SINFG_LIBS -----------------------> '$SINFG_LIBS' +"'$'"SYNFIG_LIBS -----------------------> '$SYNFIG_LIBS' "'$'"LIBXMLPP_LIBS --------------------> '$LIBXMLPP_LIBS' "'$'"ETL_LIBS -------------------------> '$ETL_LIBS' "'$'"LIBSIGC_LIBS ---------------------> '$LIBSIGC_LIBS' -"'$'"SINFG_CFLAGS ---------------------> '$SINFG_CFLAGS' +"'$'"SYNFIG_CFLAGS ---------------------> '$SYNFIG_CFLAGS' "'$'"LIBADD_DL ------------------------> '$LIBADD_DL' " diff --git a/synfig-core/trunk/config/doxygen.cfg.in b/synfig-core/trunk/config/doxygen.cfg.in index df55dce..7761201 100644 --- a/synfig-core/trunk/config/doxygen.cfg.in +++ b/synfig-core/trunk/config/doxygen.cfg.in @@ -302,7 +302,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = src/sinfg +INPUT = src/synfig # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -723,7 +723,7 @@ INCLUDE_FILE_PATTERNS = # or name=definition (no spaces). If the definition and the = are # omitted =1 is assumed. -PREDEFINED = SINFG_NO_DEPRECATED DOXYGEN_SKIP +PREDEFINED = SYNFIG_NO_DEPRECATED DOXYGEN_SKIP # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/synfig-core/trunk/config/pkgconfig.pc.in b/synfig-core/trunk/config/pkgconfig.pc.in index de4827a..0d3d35a 100644 --- a/synfig-core/trunk/config/pkgconfig.pc.in +++ b/synfig-core/trunk/config/pkgconfig.pc.in @@ -1,11 +1,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@sinfgincludedir@ +includedir=@synfigincludedir@ Name: @PACKAGE_TARNAME@ Description: @PACKAGE_NAME@ Requires: @CONFIG_DEPS@ Version: @VERSION@ Libs: -L${libdir} @CONFIG_LIBS@ -Cflags: @CONFIG_CFLAGS@ -I@sinfgincludedir@ +Cflags: @CONFIG_CFLAGS@ -I@synfigincludedir@ diff --git a/synfig-core/trunk/src/Makefile.am b/synfig-core/trunk/src/Makefile.am index 97b0e40..d540cdd 100644 --- a/synfig-core/trunk/src/Makefile.am +++ b/synfig-core/trunk/src/Makefile.am @@ -1,6 +1,6 @@ -# $Header: /opt/voria/cvs/sinfg/src/Makefile.am,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/Makefile.am,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ MAINTAINERCLEANFILES=Makefile.in -SUBDIRS=sinfg modules tool +SUBDIRS=synfig modules tool EXTRA_DIST=template.cpp template.h diff --git a/synfig-core/trunk/src/modules/Makefile.am b/synfig-core/trunk/src/modules/Makefile.am index fd9fb71..e569524 100644 --- a/synfig-core/trunk/src/modules/Makefile.am +++ b/synfig-core/trunk/src/modules/Makefile.am @@ -1,9 +1,9 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/Makefile.am,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/Makefile.am,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ -sinfglibdir=@SINFGLIB_DIR@ +synfiglibdir=@SYNFIGLIB_DIR@ MAINTAINERCLEANFILES=Makefile.in SUBDIRS=mod_particle mod_filter mod_yuv420p mod_gif mod_gradient mod_geometry mod_noise mod_libavcodec mod_jpeg mod_openexr mod_bmp mod_ppm mod_png mod_dv mod_imagemagick mod_ffmpeg lyr_freetype lyr_std -sysconf_DATA = sinfg_modules.cfg +sysconf_DATA = synfig_modules.cfg diff --git a/synfig-core/trunk/src/modules/example/Makefile.am b/synfig-core/trunk/src/modules/example/Makefile.am index e20012f..2ffef6a 100644 --- a/synfig-core/trunk/src/modules/example/Makefile.am +++ b/synfig-core/trunk/src/modules/example/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/example/Makefile.am,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/example/Makefile.am,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -8,6 +8,6 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libexample.la libexample_la_SOURCES = main.cpp simplecircle.cpp simplecircle.h filledrect.h filledrect.cpp metaballs.h metaballs.cpp -libexample_la_LIBADD = ../../sinfg/libsinfg.la @SINFG_LIBS@ +libexample_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ libexample_la_LDFLAGS = -module -no-undefined -libexample_la_CXXFLAGS = @SINFG_CFLAGS@ +libexample_la_CXXFLAGS = @SYNFIG_CFLAGS@ diff --git a/synfig-core/trunk/src/modules/example/filledrect.cpp b/synfig-core/trunk/src/modules/example/filledrect.cpp index 8d3e673..5ef237f 100644 --- a/synfig-core/trunk/src/modules/example/filledrect.cpp +++ b/synfig-core/trunk/src/modules/example/filledrect.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file filledrect.cpp ** \brief Template Header ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "filledrect.h" @@ -46,16 +46,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(FilledRect); -SINFG_LAYER_SET_NAME(FilledRect,"rectangle"); -SINFG_LAYER_SET_LOCAL_NAME(FilledRect,_("Rectangle")); -SINFG_LAYER_SET_CATEGORY(FilledRect,_("Geometry")); -SINFG_LAYER_SET_VERSION(FilledRect,"0.1"); -SINFG_LAYER_SET_CVS_ID(FilledRect,"$Id: filledrect.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $"); +SYNFIG_LAYER_INIT(FilledRect); +SYNFIG_LAYER_SET_NAME(FilledRect,"rectangle"); +SYNFIG_LAYER_SET_LOCAL_NAME(FilledRect,_("Rectangle")); +SYNFIG_LAYER_SET_CATEGORY(FilledRect,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(FilledRect,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(FilledRect,"$Id: filledrect.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/example/filledrect.h b/synfig-core/trunk/src/modules/example/filledrect.h index 380e013..3abbb58 100644 --- a/synfig-core/trunk/src/modules/example/filledrect.h +++ b/synfig-core/trunk/src/modules/example/filledrect.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file filledrect.h ** \brief Template Header ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_FILLEDRECT_H -#define __SINFG_FILLEDRECT_H +#ifndef __SYNFIG_FILLEDRECT_H +#define __SYNFIG_FILLEDRECT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -38,37 +38,37 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class FilledRect : public sinfg::Layer_Composite +class FilledRect : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Color color; + synfig::Color color; - sinfg::Point point1; - sinfg::Point point2; + synfig::Point point1; + synfig::Point point2; - sinfg::Real feather_x; - sinfg::Real feather_y; + synfig::Real feather_x; + synfig::Real feather_y; - sinfg::Real bevel; + synfig::Real bevel; bool bevCircle; - bool get_color(const sinfg::Point &pos, sinfg::Color &out, sinfg::Real &outamount)const; + bool get_color(const synfig::Point &pos, synfig::Color &out, synfig::Real &outamount)const; public: FilledRect(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; virtual Vocab get_param_vocab()const; }; // END of class FilledRect diff --git a/synfig-core/trunk/src/modules/example/main.cpp b/synfig-core/trunk/src/modules/example/main.cpp index 6fb0655..7ba5853 100644 --- a/synfig-core/trunk/src/modules/example/main.cpp +++ b/synfig-core/trunk/src/modules/example/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,9 +29,9 @@ # include #endif -#include -#include -#include +#include +#include +#include #include "simplecircle.h" #include "filledrect.h" #include "metaballs.h" @@ -45,7 +45,7 @@ MODULE_DESC_BEGIN(example) MODULE_DESCRIPTION("A dummy module that serves as a starting point for writing other modules.") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(example) diff --git a/synfig-core/trunk/src/modules/example/metaballs.cpp b/synfig-core/trunk/src/modules/example/metaballs.cpp index b9497f8..ee4e26a 100644 --- a/synfig-core/trunk/src/modules/example/metaballs.cpp +++ b/synfig-core/trunk/src/modules/example/metaballs.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file metaballs.cpp ** \brief Implements metaballs ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "metaballs.h" @@ -46,16 +46,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Metaballs); -SINFG_LAYER_SET_NAME(Metaballs,"metaballs"); -SINFG_LAYER_SET_LOCAL_NAME(Metaballs,_("Metaballs")); -SINFG_LAYER_SET_CATEGORY(Metaballs,_("Default")); -SINFG_LAYER_SET_VERSION(Metaballs,"0.1"); -SINFG_LAYER_SET_CVS_ID(Metaballs,"$Id: metaballs.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $"); +SYNFIG_LAYER_INIT(Metaballs); +SYNFIG_LAYER_SET_NAME(Metaballs,"metaballs"); +SYNFIG_LAYER_SET_LOCAL_NAME(Metaballs,_("Metaballs")); +SYNFIG_LAYER_SET_CATEGORY(Metaballs,_("Default")); +SYNFIG_LAYER_SET_VERSION(Metaballs,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id: metaballs.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -140,7 +140,7 @@ Metaballs::get_param_vocab()const return ret; } -static inline Real densityfunc(const sinfg::Point &p, const sinfg::Point &c, Real R) +static inline Real densityfunc(const synfig::Point &p, const synfig::Point &c, Real R) { const Real dx = p[0] - c[0]; const Real dy = p[1] - c[1]; diff --git a/synfig-core/trunk/src/modules/example/metaballs.h b/synfig-core/trunk/src/modules/example/metaballs.h index 73ffaac..58db5a0 100644 --- a/synfig-core/trunk/src/modules/example/metaballs.h +++ b/synfig-core/trunk/src/modules/example/metaballs.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file metaballs.h ** \brief Declares information for defining Metaballs. ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_METABALLS_H -#define __SINFG_METABALLS_H +#ifndef __SYNFIG_METABALLS_H +#define __SYNFIG_METABALLS_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -37,34 +37,34 @@ /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ -class Metaballs : public sinfg::Layer_Composite +class Metaballs : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Color color; + synfig::Color color; - std::vector centers; - std::vector radii; - std::vector weights; + std::vector centers; + std::vector radii; + std::vector weights; - sinfg::Real threshold; + synfig::Real threshold; //Real threshold2; - sinfg::Real totaldensity(const sinfg::Point &pos)const; + synfig::Real totaldensity(const synfig::Point &pos)const; public: Metaballs(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; virtual Vocab get_param_vocab()const; }; // END of class Metaballs diff --git a/synfig-core/trunk/src/modules/example/simplecircle.cpp b/synfig-core/trunk/src/modules/example/simplecircle.cpp index 780cde2..4fe01fe 100644 --- a/synfig-core/trunk/src/modules/example/simplecircle.cpp +++ b/synfig-core/trunk/src/modules/example/simplecircle.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_solidcolor.cpp ** \brief Template Header ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "simplecircle.h" @@ -45,16 +45,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(SimpleCircle); -SINFG_LAYER_SET_NAME(SimpleCircle,"simple_circle"); -SINFG_LAYER_SET_LOCAL_NAME(SimpleCircle,_("Simple Circle")); -SINFG_LAYER_SET_CATEGORY(SimpleCircle,_("Do Not Use")); -SINFG_LAYER_SET_VERSION(SimpleCircle,"0.1"); -SINFG_LAYER_SET_CVS_ID(SimpleCircle,"$Id: simplecircle.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $"); +SYNFIG_LAYER_INIT(SimpleCircle); +SYNFIG_LAYER_SET_NAME(SimpleCircle,"simple_circle"); +SYNFIG_LAYER_SET_LOCAL_NAME(SimpleCircle,_("Simple Circle")); +SYNFIG_LAYER_SET_CATEGORY(SimpleCircle,_("Do Not Use")); +SYNFIG_LAYER_SET_VERSION(SimpleCircle,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(SimpleCircle,"$Id: simplecircle.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -130,8 +130,8 @@ SimpleCircle::get_color(Context context, const Point &pos)const return context.get_color(pos); } -sinfg::Layer::Handle -SimpleCircle::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +SimpleCircle::hit_check(synfig::Context context, const synfig::Point &pos)const { if((pos-center).mag()(this); diff --git a/synfig-core/trunk/src/modules/example/simplecircle.h b/synfig-core/trunk/src/modules/example/simplecircle.h index f083300..de3c52c 100644 --- a/synfig-core/trunk/src/modules/example/simplecircle.h +++ b/synfig-core/trunk/src/modules/example/simplecircle.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file simplecircle.h ** \brief Template Header ** @@ -21,16 +21,16 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SIMPLECIRCLE_H -#define __SINFG_SIMPLECIRCLE_H +#ifndef __SYNFIG_SIMPLECIRCLE_H +#define __SYNFIG_SIMPLECIRCLE_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -38,31 +38,31 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class SimpleCircle : public sinfg::Layer_Composite +class SimpleCircle : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Color color; + synfig::Color color; - sinfg::Point center; + synfig::Point center; - sinfg::Real radius; + synfig::Real radius; public: SimpleCircle(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - //virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + //virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; // END of class SimpleCircle diff --git a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am index 86ecee2..531acce 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am +++ b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/lyr_freetype/Makefile.am,v 1.3 2005/03/24 21:07:24 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/lyr_freetype/Makefile.am,v 1.3 2005/03/24 21:07:24 darco Exp $ MAINTAINERCLEANFILES=Makefile.in INCLUDES = -I$(top_srcdir)/src @@ -9,9 +9,9 @@ moduledir=@MODULE_DIR@ if WITH_FREETYPE module_LTLIBRARIES = liblyr_freetype.la liblyr_freetype_la_SOURCES = main.cpp lyr_freetype.cpp lyr_freetype.h -liblyr_freetype_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +liblyr_freetype_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ liblyr_freetype_la_LDFLAGS = -module @FREETYPE_LIBS@ -no-undefined -liblyr_freetype_la_CXXFLAGS = @SINFG_CFLAGS@ @FREETYPE_CFLAGS@ +liblyr_freetype_la_CXXFLAGS = @SYNFIG_CFLAGS@ @FREETYPE_CFLAGS@ else endif diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp index 95b78fc..3dc5397 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: lyr_freetype.cpp,v 1.5 2005/01/24 05:00:18 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_LAYER +#define SYNFIG_LAYER #ifdef USING_PCH # include "pch.h" @@ -31,15 +31,15 @@ #include "lyr_freetype.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -47,7 +47,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -63,12 +63,12 @@ using namespace sinfg; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(lyr_freetype); -SINFG_LAYER_SET_NAME(lyr_freetype,"text"); -SINFG_LAYER_SET_LOCAL_NAME(lyr_freetype,_("Simple Text")); -SINFG_LAYER_SET_CATEGORY(lyr_freetype,_("Typography")); -SINFG_LAYER_SET_VERSION(lyr_freetype,"0.2"); -SINFG_LAYER_SET_CVS_ID(lyr_freetype,"$Id: lyr_freetype.cpp,v 1.5 2005/01/24 05:00:18 darco Exp $"); +SYNFIG_LAYER_INIT(lyr_freetype); +SYNFIG_LAYER_SET_NAME(lyr_freetype,"text"); +SYNFIG_LAYER_SET_LOCAL_NAME(lyr_freetype,_("Simple Text")); +SYNFIG_LAYER_SET_CATEGORY(lyr_freetype,_("Typography")); +SYNFIG_LAYER_SET_VERSION(lyr_freetype,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(lyr_freetype,"$Id: lyr_freetype.cpp,v 1.5 2005/01/24 05:00:18 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -123,7 +123,7 @@ lyr_freetype::~lyr_freetype() } void -lyr_freetype::new_font(const sinfg::String &family, int style, int weight) +lyr_freetype::new_font(const synfig::String &family, int style, int weight) { if( !new_font_(family,style,weight) && @@ -138,9 +138,9 @@ lyr_freetype::new_font(const sinfg::String &family, int style, int weight) } bool -lyr_freetype::new_font_(const sinfg::String &family_, int style, int weight) +lyr_freetype::new_font_(const synfig::String &family_, int style, int weight) { - sinfg::String family(family_); + synfig::String family(family_); //start evil hack for(int i=0;i(this)->sync(); @@ -567,7 +567,7 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c return true; } - sinfg::RecMutex::Lock lock(freetype_mutex); + synfig::RecMutex::Lock lock(freetype_mutex); #define CHAR_RESOLUTION (64) error = FT_Set_Char_Size( @@ -581,7 +581,7 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c // error in freetype's rendering engine. const float xerror(abs(size[0]*pw)/(float)face->size->metrics.x_ppem/1.13f/0.996); const float yerror(abs(size[1]*ph)/(float)face->size->metrics.y_ppem/1.13f/0.996); - //sinfg::info("xerror=%f, yerror=%f",xerror,yerror); + //synfig::info("xerror=%f, yerror=%f",xerror,yerror); const float compress(lyr_freetype::compress*xerror); const float vcompress(lyr_freetype::vcompress*yerror); @@ -695,8 +695,8 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c int string_height; string_height=round_to_int(((lines.size()-1)*line_height+lines.back().actual_height())); - //sinfg::info("string_height=%d",string_height); - //sinfg::info("line_height=%f",line_height); + //synfig::info("string_height=%d",string_height); + //synfig::info("line_height=%f",line_height); /* -- ** -- RENDER THE GLYPHS --------------------------------------------------- @@ -725,7 +725,7 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c bx=round_to_int((pos[0]-renddesc.get_tl()[0])*pw*CHAR_RESOLUTION-orient[0]*iter->width); by=round_to_int((pos[1]-renddesc.get_tl()[1])*ph*CHAR_RESOLUTION+(1.0-orient[1])*string_height-line_height*curr_line); //by=round_to_int(vcompress*((pos[1]-renddesc.get_tl()[1])*ph*64+(1.0-orient[1])*string_height-face->size->metrics.height*curr_line)); - //sinfg::info("curr_line=%d, bx=%d, by=%d",curr_line,bx,by); + //synfig::info("curr_line=%d, bx=%d, by=%d",curr_line,bx,by); std::vector::iterator iter2; for(iter2=iter->glyph_table.begin();iter2!=iter->glyph_table.end();++iter2) @@ -737,7 +737,7 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c pen.x = bx + iter2->pos.x; pen.y = by + iter2->pos.y; - //sinfg::info("GLYPH: pen.x=%d, pen,y=%d",curr_line,(pen.x+32)>>6,(pen.y+32)>>6); + //synfig::info("GLYPH: pen.x=%d, pen,y=%d",curr_line,(pen.x+32)>>6,(pen.y+32)>>6); error = FT_Glyph_To_Bitmap( &image, ft_render_mode_normal,0/*&pen*/, 1 ); if(error) { FT_Done_Glyph( image ); continue; } @@ -771,7 +771,7 @@ lyr_freetype::accelerated_render(Context context,Surface *surface,int quality, c return true; } -sinfg::Rect +synfig::Rect lyr_freetype::get_bounding_rect()const { if(needs_sync_) diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h index 12783b1..4de4b19 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: lyr_freetype.h,v 1.3 2005/01/24 03:08:17 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LYR_FREETYPE_H -#define __SINFG_LYR_FREETYPE_H +#ifndef __SYNFIG_LYR_FREETYPE_H +#define __SYNFIG_LYR_FREETYPE_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include FT_FREETYPE_H @@ -41,7 +41,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -80,21 +80,21 @@ struct TextLine }; -class lyr_freetype : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class lyr_freetype : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: FT_Face face; - sinfg::String font; - sinfg::String family; - sinfg::String text; - sinfg::Vector size; - sinfg::Vector orient; - sinfg::Color color; - sinfg::Point pos; - sinfg::Real compress; - sinfg::Real vcompress; + synfig::String font; + synfig::String family; + synfig::String text; + synfig::Vector size; + synfig::Vector orient; + synfig::Color color; + synfig::Point pos; + synfig::Real compress; + synfig::Real vcompress; int style; int weight; @@ -107,13 +107,13 @@ private: void sync(); - mutable sinfg::Mutex mutex; + mutable synfig::Mutex mutex; public: lyr_freetype(); virtual ~lyr_freetype(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; @@ -123,12 +123,12 @@ public: virtual bool set_version(const String &ver){if(ver=="0.1")old_version=true;return true;} virtual void reset_version(){old_version=false;} - virtual sinfg::Rect get_bounding_rect()const; + virtual synfig::Rect get_bounding_rect()const; private: - void new_font(const sinfg::String &family, int style=0, int weight=400); - bool new_font_(const sinfg::String &family, int style=0, int weight=400); - bool new_face(const sinfg::String &newfont); + void new_font(const synfig::String &family, int style=0, int weight=400); + bool new_font_(const synfig::String &family, int style=0, int weight=400); + bool new_face(const synfig::String &newfont); }; extern FT_Library ft_library; diff --git a/synfig-core/trunk/src/modules/lyr_freetype/main.cpp b/synfig-core/trunk/src/modules/lyr_freetype/main.cpp index 1165924..f8f1962 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/main.cpp +++ b/synfig-core/trunk/src/modules/lyr_freetype/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -30,7 +30,7 @@ #endif #include -#include +#include #include "lyr_freetype.h" #include #include @@ -42,13 +42,13 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; FT_Library ft_library; /* === E N T R Y P O I N T ================================================= */ -bool freetype_constructor(sinfg::ProgressCallback *cb) +bool freetype_constructor(synfig::ProgressCallback *cb) { int error; if(cb)cb->task("Initializing FreeType..."); @@ -72,7 +72,7 @@ MODULE_DESC_BEGIN(liblyr_freetype) MODULE_DESCRIPTION("Provides a font rendering layer via FreeType") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_CONSTRUCTOR(freetype_constructor) MODULE_DESTRUCTOR(freetype_destructor) diff --git a/synfig-core/trunk/src/modules/lyr_std/Makefile.am b/synfig-core/trunk/src/modules/lyr_std/Makefile.am index f382c48..656644f 100644 --- a/synfig-core/trunk/src/modules/lyr_std/Makefile.am +++ b/synfig-core/trunk/src/modules/lyr_std/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/lyr_std/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/lyr_std/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -8,6 +8,6 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = liblyr_std.la liblyr_std_la_SOURCES = main.cpp timeloop.cpp timeloop.h warp.cpp warp.h xorpattern.cpp booleancurve.h booleancurve.cpp bevel.cpp bevel.h shade.cpp shade.h twirl.cpp twirl.h stretch.cpp stretch.h xorpattern.h clamp.cpp clamp.h supersample.cpp supersample.h insideout.cpp insideout.h julia.cpp julia.h rotate.cpp rotate.h mandelbrot.cpp mandelbrot.h zoom.h zoom.cpp import.cpp import.h translate.h translate.cpp sphere_distort.h sphere_distort.cpp -liblyr_std_la_CXXFLAGS = @SINFG_CFLAGS@ -liblyr_std_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +liblyr_std_la_CXXFLAGS = @SYNFIG_CFLAGS@ +liblyr_std_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ liblyr_std_la_LDFLAGS = -module -no-undefined diff --git a/synfig-core/trunk/src/modules/lyr_std/bevel.cpp b/synfig-core/trunk/src/modules/lyr_std/bevel.cpp index 16a331f..aaff224 100644 --- a/synfig-core/trunk/src/modules/lyr_std/bevel.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/bevel.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file shade.cpp ** \brief Template Header ** @@ -30,15 +30,15 @@ #include "bevel.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -46,7 +46,7 @@ #endif -using namespace sinfg; +using namespace synfig; using namespace etl; using namespace std; @@ -61,16 +61,16 @@ using namespace std; /* -- G L O B A L S --------------------------------------------------------- */ -SINFG_LAYER_INIT(Layer_Bevel); -SINFG_LAYER_SET_NAME(Layer_Bevel,"bevel"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_Bevel,_("Bevel")); -SINFG_LAYER_SET_CATEGORY(Layer_Bevel,_("Stylize")); -SINFG_LAYER_SET_VERSION(Layer_Bevel,"0.2"); -SINFG_LAYER_SET_CVS_ID(Layer_Bevel,"$Id: bevel.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_Bevel); +SYNFIG_LAYER_SET_NAME(Layer_Bevel,"bevel"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Bevel,_("Bevel")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Bevel,_("Stylize")); +SYNFIG_LAYER_SET_VERSION(Layer_Bevel,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Bevel,"$Id: bevel.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); /* -- F U N C T I O N S ----------------------------------------------------- */ -inline void clamp(sinfg::Vector &v) +inline void clamp(synfig::Vector &v) { if(v[0]<0.0)v[0]=0.0; if(v[1]<0.0)v[1]=0.0; diff --git a/synfig-core/trunk/src/modules/lyr_std/bevel.h b/synfig-core/trunk/src/modules/lyr_std/bevel.h index 2a70f82..bcd37dc 100644 --- a/synfig-core/trunk/src/modules/lyr_std/bevel.h +++ b/synfig-core/trunk/src/modules/lyr_std/bevel.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file shade.h ** \brief Template Header ** @@ -21,36 +21,36 @@ /* === H E A D E R S ======================================================= */ -#ifndef __SINFG_LAYER_BEVEL_H__ -#define __SINFG_LAYER_BEVEL_H__ +#ifndef __SYNFIG_LAYER_BEVEL_H__ +#define __SYNFIG_LAYER_BEVEL_H__ /* -- H E A D E R S --------------------------------------------------------- */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Layer_Bevel : public sinfg::Layer_Composite +class Layer_Bevel : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Real softness; + synfig::Real softness; int type; - sinfg::Color color1; - sinfg::Color color2; + synfig::Color color1; + synfig::Color color2; - sinfg::Angle angle; - sinfg::Real depth; + synfig::Angle angle; + synfig::Real depth; - sinfg::Vector offset; - sinfg::Vector offset45; + synfig::Vector offset; + synfig::Vector offset45; bool use_luma; bool solid; @@ -59,7 +59,7 @@ private: public: Layer_Bevel(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; @@ -67,7 +67,7 @@ public: virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - virtual sinfg::Rect get_full_bounding_rect(Context context)const; + virtual synfig::Rect get_full_bounding_rect(Context context)const; virtual Vocab get_param_vocab()const; }; // END of class Blur diff --git a/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp b/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp index eb6f76b..588709d 100644 --- a/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file boolean_curve.cpp ** \brief Boolean Curve Implementation File ** @@ -30,14 +30,14 @@ #include "booleancurve.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -45,7 +45,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -65,7 +65,7 @@ BooleanCurve::~BooleanCurve() { } -bool BooleanCurve::set_param(const String & param, const sinfg::ValueBase &value) +bool BooleanCurve::set_param(const String & param, const synfig::ValueBase &value) { if(param=="regions" && value.same_as(regions)) { diff --git a/synfig-core/trunk/src/modules/lyr_std/booleancurve.h b/synfig-core/trunk/src/modules/lyr_std/booleancurve.h index 82129fb..53cc8c0 100644 --- a/synfig-core/trunk/src/modules/lyr_std/booleancurve.h +++ b/synfig-core/trunk/src/modules/lyr_std/booleancurve.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file boolean_curve.h ** \brief Boolean Curve Header ** @@ -21,12 +21,12 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_BOOLEAN_CURVE_H -#define __SINFG_BOOLEAN_CURVE_H +#ifndef __SYNFIG_BOOLEAN_CURVE_H +#define __SYNFIG_BOOLEAN_CURVE_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include @@ -35,7 +35,7 @@ /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg +namespace synfig { class BooleanCurve : public Layer_Shape @@ -59,7 +59,7 @@ public: BooleanCurve(); ~BooleanCurve(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Vocab get_param_vocab()const; @@ -68,7 +68,7 @@ public: virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; }; -} //end of namespace sinfg +} //end of namespace synfig /* === E N D =============================================================== */ #endif diff --git a/synfig-core/trunk/src/modules/lyr_std/clamp.cpp b/synfig-core/trunk/src/modules/lyr_std/clamp.cpp index 500adde..cf0a830 100644 --- a/synfig-core/trunk/src/modules/lyr_std/clamp.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/clamp.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file clamp.cpp ** \brief Template Header ** @@ -29,14 +29,14 @@ #endif #include "clamp.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -44,16 +44,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_Clamp); -SINFG_LAYER_SET_NAME(Layer_Clamp,"clamp"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_Clamp,_("Clamp")); -SINFG_LAYER_SET_CATEGORY(Layer_Clamp,_("Filters")); -SINFG_LAYER_SET_VERSION(Layer_Clamp,"0.2"); -SINFG_LAYER_SET_CVS_ID(Layer_Clamp,"$Id: clamp.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_Clamp); +SYNFIG_LAYER_SET_NAME(Layer_Clamp,"clamp"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Clamp,_("Clamp")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Clamp,_("Filters")); +SYNFIG_LAYER_SET_VERSION(Layer_Clamp,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Clamp,"$Id: clamp.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/lyr_std/clamp.h b/synfig-core/trunk/src/modules/lyr_std/clamp.h index 12205cb..344921d 100644 --- a/synfig-core/trunk/src/modules/lyr_std/clamp.h +++ b/synfig-core/trunk/src/modules/lyr_std/clamp.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file clamp.h ** \brief Template Header ** @@ -21,12 +21,12 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_SOLIDCOLOR_H -#define __SINFG_LAYER_SOLIDCOLOR_H +#ifndef __SYNFIG_LAYER_SOLIDCOLOR_H +#define __SYNFIG_LAYER_SOLIDCOLOR_H /* === H E A D E R S ======================================================= */ -#include +#include /* === M A C R O S ========================================================= */ @@ -34,11 +34,11 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Layer_Clamp : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: @@ -54,7 +54,7 @@ public: Layer_Clamp(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; @@ -67,7 +67,7 @@ public: virtual Vocab get_param_vocab()const; }; // END of class Layer_Clamp -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/import.cpp b/synfig-core/trunk/src/modules/lyr_std/import.cpp index 5d6cdce..29df897 100644 --- a/synfig-core/trunk/src/modules/lyr_std/import.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/import.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Image Import Layer Implementation ** $Id: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp $ ** @@ -28,19 +28,19 @@ #endif #include "import.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -48,12 +48,12 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Import); -SINFG_LAYER_SET_NAME(Import,"import"); -SINFG_LAYER_SET_LOCAL_NAME(Import,_("Import")); -SINFG_LAYER_SET_CATEGORY(Import,_("Other")); -SINFG_LAYER_SET_VERSION(Import,"0.1"); -SINFG_LAYER_SET_CVS_ID(Import,"$Id: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp $"); +SYNFIG_LAYER_INIT(Import); +SYNFIG_LAYER_SET_NAME(Import,"import"); +SYNFIG_LAYER_SET_LOCAL_NAME(Import,_("Import")); +SYNFIG_LAYER_SET_CATEGORY(Import,_("Other")); +SYNFIG_LAYER_SET_VERSION(Import,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Import,"$Id: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -101,7 +101,7 @@ Import::set_param(const String & param, const ValueBase &value) //if(get_canvas()->get_file_path()==dirname(newfilename)) //{ - // sinfg::info("Image seems to be in local directory. Adjusting path..."); + // synfig::info("Image seems to be in local directory. Adjusting path..."); // newfilename=basename(newfilename); //} @@ -112,7 +112,7 @@ Import::set_param(const String & param, const ValueBase &value) while(basename(curpath)==".")curpath=dirname(curpath); newfilename=relative_path(curpath,newfilename); - sinfg::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str()); + synfig::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str()); } #endif @@ -130,7 +130,7 @@ Import::set_param(const String & param, const ValueBase &value) // If we are already loaded, don't reload if(filename==newfilename && importer) { - sinfg::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str())); + synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str())); return true; } @@ -150,7 +150,7 @@ Import::set_param(const String & param, const ValueBase &value) newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPERATOR+basename(newfilename)); if(!newimporter) { - sinfg::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str())); + synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str())); surface.clear(); return false; } @@ -159,7 +159,7 @@ Import::set_param(const String & param, const ValueBase &value) surface.clear(); if(!newimporter->get_frame(surface,Time(0))) { - sinfg::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str())); + synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str())); } importer=newimporter; diff --git a/synfig-core/trunk/src/modules/lyr_std/import.h b/synfig-core/trunk/src/modules/lyr_std/import.h index 16a7ef7..413415b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/import.h +++ b/synfig-core/trunk/src/modules/lyr_std/import.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file import.h ** \brief Template Header ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_IMPORT_H -#define __SINFG_IMPORT_H +#ifndef __SYNFIG_IMPORT_H +#define __SYNFIG_IMPORT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -37,15 +37,15 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Import : public sinfg::Layer_Bitmap +class Import : public synfig::Layer_Bitmap { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::String filename; - sinfg::String abs_filename; - sinfg::Importer::Handle importer; - sinfg::Time time_offset; + synfig::String filename; + synfig::String abs_filename; + synfig::Importer::Handle importer; + synfig::Time time_offset; protected: Import(); @@ -53,17 +53,17 @@ protected: public: ~Import(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; virtual Vocab get_param_vocab()const; virtual void on_canvas_set(); - virtual void set_time(sinfg::Context context, sinfg::Time time)const; + virtual void set_time(synfig::Context context, synfig::Time time)const; - virtual void set_time(sinfg::Context context, sinfg::Time time, const sinfg::Point &pos)const; + virtual void set_time(synfig::Context context, synfig::Time time, const synfig::Point &pos)const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/insideout.cpp b/synfig-core/trunk/src/modules/lyr_std/insideout.cpp index b1af4f4..6ca9c01 100644 --- a/synfig-core/trunk/src/modules/lyr_std/insideout.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/insideout.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: insideout.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -29,15 +29,15 @@ #include "insideout.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -45,12 +45,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(InsideOut); -SINFG_LAYER_SET_NAME(InsideOut,"inside_out"); -SINFG_LAYER_SET_LOCAL_NAME(InsideOut,_("InsideOut")); -SINFG_LAYER_SET_CATEGORY(InsideOut,_("Distortions")); -SINFG_LAYER_SET_VERSION(InsideOut,"0.1"); -SINFG_LAYER_SET_CVS_ID(InsideOut,"$Id: insideout.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(InsideOut); +SYNFIG_LAYER_SET_NAME(InsideOut,"inside_out"); +SYNFIG_LAYER_SET_LOCAL_NAME(InsideOut,_("InsideOut")); +SYNFIG_LAYER_SET_CATEGORY(InsideOut,_("Distortions")); +SYNFIG_LAYER_SET_VERSION(InsideOut,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(InsideOut,"$Id: insideout.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -79,8 +79,8 @@ InsideOut::get_param(const String & param)const return ValueBase(); } -sinfg::Layer::Handle -InsideOut::hit_check(sinfg::Context context, const sinfg::Point &p)const +synfig::Layer::Handle +InsideOut::hit_check(synfig::Context context, const synfig::Point &p)const { Point pos(p-origin); Real inv_mag=pos.inv_mag(); @@ -103,7 +103,7 @@ class InsideOut_Trans : public Transform public: InsideOut_Trans(const InsideOut* x):layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { Point pos(x-layer->origin); Real inv_mag=pos.inv_mag(); @@ -112,7 +112,7 @@ public: return x; } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { Point pos(x-layer->origin); Real inv_mag=pos.inv_mag(); diff --git a/synfig-core/trunk/src/modules/lyr_std/insideout.h b/synfig-core/trunk/src/modules/lyr_std/insideout.h index d61dee6..a42a430 100644 --- a/synfig-core/trunk/src/modules/lyr_std/insideout.h +++ b/synfig-core/trunk/src/modules/lyr_std/insideout.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: insideout.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_INSIDEOUT_H -#define __SINFG_INSIDEOUT_H +#ifndef __SYNFIG_INSIDEOUT_H +#define __SYNFIG_INSIDEOUT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,14 +35,14 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class InsideOut_Trans; class InsideOut : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class InsideOut_Trans; private: @@ -55,9 +55,9 @@ public: virtual bool set_param(const String ¶m, const ValueBase &value); virtual ValueBase get_param(const String ¶m)const; virtual Color get_color(Context context, const Point &pos)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; - virtual etl::handle get_transform()const; + virtual etl::handle get_transform()const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/julia.cpp b/synfig-core/trunk/src/modules/lyr_std/julia.cpp index a090ce4..5bafb0b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/julia.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/julia.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: julia.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -29,14 +29,14 @@ #include "julia.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -46,12 +46,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Julia); -SINFG_LAYER_SET_NAME(Julia,"julia"); -SINFG_LAYER_SET_LOCAL_NAME(Julia,_("Julia Set")); -SINFG_LAYER_SET_CATEGORY(Julia,_("Fractals")); -SINFG_LAYER_SET_VERSION(Julia,"0.1"); -SINFG_LAYER_SET_CVS_ID(Julia,"$Id: julia.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Julia); +SYNFIG_LAYER_SET_NAME(Julia,"julia"); +SYNFIG_LAYER_SET_LOCAL_NAME(Julia,_("Julia Set")); +SYNFIG_LAYER_SET_CATEGORY(Julia,_("Fractals")); +SYNFIG_LAYER_SET_VERSION(Julia,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Julia,"$Id: julia.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/lyr_std/julia.h b/synfig-core/trunk/src/modules/lyr_std/julia.h index e2c8631..7a2ef27 100644 --- a/synfig-core/trunk/src/modules/lyr_std/julia.h +++ b/synfig-core/trunk/src/modules/lyr_std/julia.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: julia.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_JULIA_H -#define __SINFG_JULIA_H +#ifndef __SYNFIG_JULIA_H +#define __SYNFIG_JULIA_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -36,23 +36,23 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Julia : public sinfg::Layer +class Julia : public synfig::Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Color icolor; - sinfg::Color ocolor; - sinfg::Angle color_shift; + synfig::Color icolor; + synfig::Color ocolor; + synfig::Angle color_shift; Real bailout; Real lp; int iterations; - sinfg::Point seed; + synfig::Point seed; bool distort_inside; bool distort_outside; @@ -72,11 +72,11 @@ private: public: Julia(); - virtual bool set_param(const sinfg::String ¶m, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String ¶m, const synfig::ValueBase &value); - virtual ValueBase get_param(const sinfg::String ¶m)const; + virtual ValueBase get_param(const synfig::String ¶m)const; - virtual Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual Color get_color(synfig::Context context, const synfig::Point &pos)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh b/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh index 08b01db..8c3df9c 100644 --- a/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh +++ b/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh @@ -4,13 +4,13 @@ Section "lyr_std" Sec_lyr_std ; SectionIn RO ; Set output path to the installation directory. - SetOutPath "$INSTDIR\lib\sinfg\modules" + SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there File /oname=lyr_std.dll "src\modules\lyr_std\.libs\liblyr_std-0.dll" - FileOpen $0 $INSTDIR\etc\sinfg_modules.cfg a + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a FileSeek $0 0 END FileWrite $0 "lyr_std" FileWriteByte $0 "13" diff --git a/synfig-core/trunk/src/modules/lyr_std/main.cpp b/synfig-core/trunk/src/modules/lyr_std/main.cpp index 8d09009..e64f0e0 100644 --- a/synfig-core/trunk/src/modules/lyr_std/main.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,8 +29,8 @@ # include #endif -#include -#include +#include +#include #include "zoom.h" //#include "blur.h" @@ -71,7 +71,7 @@ MODULE_DESC_BEGIN(liblyr_std) MODULE_DESCRIPTION("Provides a basic set of standard layers") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(liblyr_std) diff --git a/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp b/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp index 70a762f..22b2a8e 100644 --- a/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: mandelbrot.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -29,14 +29,14 @@ #include "mandelbrot.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -46,12 +46,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Mandelbrot); -SINFG_LAYER_SET_NAME(Mandelbrot,"mandelbrot"); -SINFG_LAYER_SET_LOCAL_NAME(Mandelbrot,_("Mandelbrot Set")); -SINFG_LAYER_SET_CATEGORY(Mandelbrot,_("Fractals")); -SINFG_LAYER_SET_VERSION(Mandelbrot,"0.2"); -SINFG_LAYER_SET_CVS_ID(Mandelbrot,"$Id: mandelbrot.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Mandelbrot); +SYNFIG_LAYER_SET_NAME(Mandelbrot,"mandelbrot"); +SYNFIG_LAYER_SET_LOCAL_NAME(Mandelbrot,_("Mandelbrot Set")); +SYNFIG_LAYER_SET_CATEGORY(Mandelbrot,_("Fractals")); +SYNFIG_LAYER_SET_VERSION(Mandelbrot,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Mandelbrot,"$Id: mandelbrot.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/lyr_std/mandelbrot.h b/synfig-core/trunk/src/modules/lyr_std/mandelbrot.h index 842bb01..bf026a2 100644 --- a/synfig-core/trunk/src/modules/lyr_std/mandelbrot.h +++ b/synfig-core/trunk/src/modules/lyr_std/mandelbrot.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: mandelbrot.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MANDELBROT_H -#define __SINFG_MANDELBROT_H +#ifndef __SYNFIG_MANDELBROT_H +#define __SYNFIG_MANDELBROT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -36,13 +36,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class Mandelbrot : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: diff --git a/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp b/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp index de36ed8..3cf9fa1 100644 --- a/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_solidcolor.cpp ** \brief Template Header ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "radialgradient.h" @@ -45,16 +45,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(RadialGradient); -SINFG_LAYER_SET_NAME(RadialGradient,"radial_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient")); -SINFG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(RadialGradient,"0.1"); -SINFG_LAYER_SET_CVS_ID(RadialGradient,"$Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(RadialGradient); +SYNFIG_LAYER_SET_NAME(RadialGradient,"radial_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient")); +SYNFIG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(RadialGradient,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(RadialGradient,"$Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -178,14 +178,14 @@ RadialGradient::color_func(const Point &point, float supersample)const float -RadialGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +RadialGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const { // return sqrt(pw*pw+ph*ph)/radius; return 1.2*pw/radius; } -sinfg::Layer::Handle -RadialGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +RadialGradient::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/lyr_std/rotate.cpp b/synfig-core/trunk/src/modules/lyr_std/rotate.cpp index 166bd0a..dacbfb7 100644 --- a/synfig-core/trunk/src/modules/lyr_std/rotate.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/rotate.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: rotate.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $ ** @@ -28,15 +28,15 @@ #endif #include "rotate.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #endif @@ -45,12 +45,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Rotate); -SINFG_LAYER_SET_NAME(Rotate,"rotate"); -SINFG_LAYER_SET_LOCAL_NAME(Rotate,_("Rotate")); -SINFG_LAYER_SET_CATEGORY(Rotate,_("Transform")); -SINFG_LAYER_SET_VERSION(Rotate,"0.1"); -SINFG_LAYER_SET_CVS_ID(Rotate,"$Id: rotate.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); +SYNFIG_LAYER_INIT(Rotate); +SYNFIG_LAYER_SET_NAME(Rotate,"rotate"); +SYNFIG_LAYER_SET_LOCAL_NAME(Rotate,_("Rotate")); +SYNFIG_LAYER_SET_CATEGORY(Rotate,_("Transform")); +SYNFIG_LAYER_SET_VERSION(Rotate,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Rotate,"$Id: rotate.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -123,13 +123,13 @@ class Rotate_Trans : public Transform public: Rotate_Trans(const Rotate* x):Transform(x->get_guid()),layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { Point pos(x-layer->origin); return Point(layer->cos_val*pos[0]-layer->sin_val*pos[1],layer->sin_val*pos[0]+layer->cos_val*pos[1])+layer->origin; } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { Point pos(x-layer->origin); return Point(layer->cos_val*pos[0]+layer->sin_val*pos[1],-layer->sin_val*pos[0]+layer->cos_val*pos[1])+layer->origin; @@ -141,8 +141,8 @@ Rotate::get_transform()const return new Rotate_Trans(this); } -sinfg::Layer::Handle -Rotate::hit_check(sinfg::Context context, const sinfg::Point &p)const +synfig::Layer::Handle +Rotate::hit_check(synfig::Context context, const synfig::Point &p)const { Point pos(p-origin); Point newpos(cos_val*pos[0]+sin_val*pos[1],-sin_val*pos[0]+cos_val*pos[1]); @@ -227,8 +227,8 @@ Rotate::accelerated_render(Context context,Surface *surface,int quality, const R desc.set_br(br); desc.set_wh(round_to_int(pw*(br[0]-tl[0])),round_to_int(ph*(br[1]-tl[1]))); - //sinfg::warning("given window: [%f,%f]-[%f,%f] %dx%d",renddesc.get_tl()[0],renddesc.get_tl()[1],renddesc.get_br()[0],renddesc.get_br()[1],renddesc.get_w(),renddesc.get_h()); - //sinfg::warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h()); + //synfig::warning("given window: [%f,%f]-[%f,%f] %dx%d",renddesc.get_tl()[0],renddesc.get_tl()[1],renddesc.get_br()[0],renddesc.get_br()[1],renddesc.get_w(),renddesc.get_h()); + //synfig::warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h()); Surface source; source.set_wh(desc.get_w(),desc.get_h()); diff --git a/synfig-core/trunk/src/modules/lyr_std/rotate.h b/synfig-core/trunk/src/modules/lyr_std/rotate.h index 533dcce..5494219 100644 --- a/synfig-core/trunk/src/modules/lyr_std/rotate.h +++ b/synfig-core/trunk/src/modules/lyr_std/rotate.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: rotate.h,v 1.2 2005/01/24 05:00:18 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_ROTATE_H -#define __SINFG_ROTATE_H +#ifndef __SYNFIG_ROTATE_H +#define __SYNFIG_ROTATE_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,14 +35,14 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class Rotate_Trans; class Rotate : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class Rotate_Trans; private: Vector origin; @@ -54,15 +54,15 @@ public: Rotate(); ~Rotate(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); - virtual ValueBase get_param(const sinfg::String & param)const; + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); + virtual ValueBase get_param(const synfig::String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; virtual Rect get_full_bounding_rect(Context context)const; - virtual etl::handle get_transform()const; + virtual etl::handle get_transform()const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/shade.cpp b/synfig-core/trunk/src/modules/lyr_std/shade.cpp index 8fa5b75..06f8261 100644 --- a/synfig-core/trunk/src/modules/lyr_std/shade.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/shade.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file shade.cpp ** \brief Template Header ** @@ -30,15 +30,15 @@ #include "shade.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -46,7 +46,7 @@ #endif -using namespace sinfg; +using namespace synfig; using namespace etl; using namespace std; @@ -61,16 +61,16 @@ using namespace std; /* -- G L O B A L S --------------------------------------------------------- */ -SINFG_LAYER_INIT(Layer_Shade); -SINFG_LAYER_SET_NAME(Layer_Shade,"shade"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_Shade,_("Shade")); -SINFG_LAYER_SET_CATEGORY(Layer_Shade,_("Stylize")); -SINFG_LAYER_SET_VERSION(Layer_Shade,"0.2"); -SINFG_LAYER_SET_CVS_ID(Layer_Shade,"$Id: shade.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_Shade); +SYNFIG_LAYER_SET_NAME(Layer_Shade,"shade"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shade,_("Shade")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Shade,_("Stylize")); +SYNFIG_LAYER_SET_VERSION(Layer_Shade,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Shade,"$Id: shade.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); /* -- F U N C T I O N S ----------------------------------------------------- */ -inline void clamp(sinfg::Vector &v) +inline void clamp(synfig::Vector &v) { if(v[0]<0.0)v[0]=0.0; if(v[1]<0.0)v[1]=0.0; @@ -313,7 +313,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co workdesc.clear_flags(); workdesc.set_wh(tmpw,tmph); - //sinfg::info("fw: %d, fh: %d",fw,fh); + //synfig::info("fw: %d, fh: %d",fw,fh); //render the blur fodder if(!context.accelerated_render(&worksurface,quality,workdesc,&stageone)) diff --git a/synfig-core/trunk/src/modules/lyr_std/shade.h b/synfig-core/trunk/src/modules/lyr_std/shade.h index 14b8e76..db1510e 100644 --- a/synfig-core/trunk/src/modules/lyr_std/shade.h +++ b/synfig-core/trunk/src/modules/lyr_std/shade.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file shade.h ** \brief Template Header ** @@ -21,34 +21,34 @@ /* === H E A D E R S ======================================================= */ -#ifndef __SINFG_LAYER_SHADE_H__ -#define __SINFG_LAYER_SHADE_H__ +#ifndef __SYNFIG_LAYER_SHADE_H__ +#define __SYNFIG_LAYER_SHADE_H__ /* -- H E A D E R S --------------------------------------------------------- */ -#include -#include -#include -#include +#include +#include +#include +#include -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Layer_Shade : public sinfg::Layer_Composite +class Layer_Shade : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Vector size; + synfig::Vector size; int type; - sinfg::Color color; - sinfg::Vector offset; + synfig::Color color; + synfig::Vector offset; bool invert; public: Layer_Shade(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; diff --git a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp index af4c3c7..b532895 100644 --- a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file sphere_distort.cpp ** \brief Sphere Distort File ** @@ -29,17 +29,17 @@ #endif #include "sphere_distort.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #endif @@ -47,7 +47,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -65,12 +65,12 @@ enum /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_SphereDistort); -SINFG_LAYER_SET_NAME(Layer_SphereDistort,"spherize"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_SphereDistort,_("Spherize")); -SINFG_LAYER_SET_CATEGORY(Layer_SphereDistort,_("Distortions")); -SINFG_LAYER_SET_VERSION(Layer_SphereDistort,"0.2"); -SINFG_LAYER_SET_CVS_ID(Layer_SphereDistort,"$Id: sphere_distort.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_SphereDistort); +SYNFIG_LAYER_SET_NAME(Layer_SphereDistort,"spherize"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SphereDistort,_("Spherize")); +SYNFIG_LAYER_SET_CATEGORY(Layer_SphereDistort,_("Distortions")); +SYNFIG_LAYER_SET_VERSION(Layer_SphereDistort,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Layer_SphereDistort,"$Id: sphere_distort.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -104,10 +104,10 @@ Layer_SphereDistort::set_param(const String & param, const ValueBase &value) { connect_dynamic_param("amount",dynamic_param_list().find("percent")->second); disconnect_dynamic_param("percent"); - sinfg::warning("Layer_SphereDistort::::set_param(): Updated valuenode connection to use the new \"amount\" parameter."); + synfig::warning("Layer_SphereDistort::::set_param(): Updated valuenode connection to use the new \"amount\" parameter."); } else - sinfg::warning("Layer_SphereDistort::::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead."); + synfig::warning("Layer_SphereDistort::::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead."); } return false; @@ -295,8 +295,8 @@ inline Point sphtrans(const Point &p, const Point ¢er, const Real &radius, return sphtrans(p, center, radius, percent, type, tmp); } -sinfg::Layer::Handle -Layer_SphereDistort::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Layer_SphereDistort::hit_check(synfig::Context context, const synfig::Point &pos)const { bool clipped; Point point(sphtrans(pos,center,radius,percent,type,clipped)); @@ -347,11 +347,11 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in (type == TYPE_DISTH && (sphr.minx >= windr.maxx || windr.minx >= sphr.maxx)) || (type == TYPE_DISTV && (sphr.miny >= windr.maxy || windr.miny >= sphr.maxy)) ) { - //sinfg::warning("Spherize: Bounding box reject"); + //synfig::warning("Spherize: Bounding box reject"); return context.accelerated_render(surface,quality,renddesc,cb); } - //sinfg::warning("Spherize: Bounding box accept"); + //synfig::warning("Spherize: Bounding box accept"); } //Ok, so we overlap some... now expand the window for rendering @@ -380,10 +380,10 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in //expandr.set_point(tl[0],tl[1]); //expandr.expand(br[0],br[1]); - //sinfg::warning("Spherize: Loop through lines and stuff"); + //synfig::warning("Spherize: Loop through lines and stuff"); for(int i=0; i<4; ++i) { - //sinfg::warning("Spherize: %d", i); + //synfig::warning("Spherize: %d", i); Vector p_o = center-origin[i]; //project onto left line @@ -403,13 +403,13 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in expandr.expand(p[0],p[1]); } - /*sinfg::warning("Spherize: Bounding box (%f,%f)-(%f,%f)", + /*synfig::warning("Spherize: Bounding box (%f,%f)-(%f,%f)", expandr.minx,expandr.miny,expandr.maxx,expandr.maxy);*/ //now that we have the bouding rectangle of ALL the pixels (should be...) //order it so that it's in the same orientation as the tl,br pair - //sinfg::warning("Spherize: Organize like tl,br"); + //synfig::warning("Spherize: Organize like tl,br"); Point ntl(0,0),nbr(0,0); //sort x @@ -450,7 +450,7 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in nw = renddesc.get_w() + nr - nl; nh = renddesc.get_h() + nb - nt; - //sinfg::warning("Spherize: Setting subwindow (%d,%d) (%d,%d) (%d,%d)",nl,nt,nr,nb,nw,nh); + //synfig::warning("Spherize: Setting subwindow (%d,%d) (%d,%d) (%d,%d)",nl,nt,nr,nb,nw,nh); r.set_subwindow(nl,nt,nw,nh); /*r = renddesc; @@ -458,10 +458,10 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in nl = 0, nt = 0;*/ } - //sinfg::warning("Spherize: render background"); + //synfig::warning("Spherize: render background"); if(!context.accelerated_render(&background,quality,r,cb)) { - sinfg::warning("SphereDistort: Layer below failed"); + synfig::warning("SphereDistort: Layer below failed"); return false; } @@ -477,7 +477,7 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in Point rtl = r.get_tl(); - //sinfg::warning("Spherize: About to transform"); + //synfig::warning("Spherize: About to transform"); for(y = 0; y < h; ++y, sample[1] += ph, p.inc_y()) { @@ -497,7 +497,7 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in if(!(xs >= 0 && xs < nw && ys >= 0 && ys < nh)) { - //sinfg::warning("Spherize: we failed to account for %f,%f",xs,ys); + //synfig::warning("Spherize: we failed to account for %f,%f",xs,ys); p.put_value(context.get_color(trans));//Color::alpha()); continue; } @@ -530,12 +530,12 @@ class Spherize_Trans : public Transform public: Spherize_Trans(const Layer_SphereDistort* x):Transform(x->get_guid()),layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { return sphtrans(x,layer->center,layer->radius,-layer->percent,layer->type); } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { return sphtrans(x,layer->center,layer->radius,layer->percent,layer->type); } diff --git a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h index c86e6e1..8f91013 100644 --- a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h +++ b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file sphere_distort.h ** \brief Sphere Distort Header ** @@ -21,14 +21,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SPHERE_DISTORT_H -#define __SINFG_SPHERE_DISTORT_H +#ifndef __SYNFIG_SPHERE_DISTORT_H +#define __SYNFIG_SPHERE_DISTORT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -36,12 +36,12 @@ /* === C L A S S E S & S T R U C T S ======================================= */ class Spherize_Trans; -namespace sinfg +namespace synfig { class Layer_SphereDistort : public Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class Spherize_Trans; private: @@ -60,7 +60,7 @@ private: bool clip; - sinfg::Rect bounds; + synfig::Rect bounds; void sync(); @@ -68,19 +68,19 @@ public: Layer_SphereDistort(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Rect get_bounding_rect()const; virtual Vocab get_param_vocab()const; - virtual etl::handle get_transform()const; + virtual etl::handle get_transform()const; }; // END of class Layer_SphereDistort } diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp index ccd2ee6..022ed2a 100644 --- a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file stretch.cpp ** \brief Template Header ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -31,15 +31,15 @@ #endif #include "stretch.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -47,16 +47,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_Stretch); -SINFG_LAYER_SET_NAME(Layer_Stretch,"stretch"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_Stretch,_("Stretch")); -SINFG_LAYER_SET_CATEGORY(Layer_Stretch,_("Distortions")); -SINFG_LAYER_SET_VERSION(Layer_Stretch,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_Stretch,"$Id: stretch.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_Stretch); +SYNFIG_LAYER_SET_NAME(Layer_Stretch,"stretch"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Stretch,_("Stretch")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Stretch,_("Distortions")); +SYNFIG_LAYER_SET_VERSION(Layer_Stretch,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Stretch,"$Id: stretch.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -108,8 +108,8 @@ Layer_Stretch::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Layer_Stretch::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Layer_Stretch::hit_check(synfig::Context context, const synfig::Point &pos)const { Point npos(pos); npos[0]=(npos[0]-center[0])/amount[0]+center[0]; @@ -132,12 +132,12 @@ class Stretch_Trans : public Transform public: Stretch_Trans(const Layer_Stretch* x):Transform(x->get_guid()),layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { return Vector((x[0]-layer->center[0])*layer->amount[0]+layer->center[0],(x[1]-layer->center[1])*layer->amount[1]+layer->center[1]); } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { return Vector((x[0]-layer->center[0])/layer->amount[0]+layer->center[0],(x[1]-layer->center[1])/layer->amount[1]+layer->center[1]); } diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.h b/synfig-core/trunk/src/modules/lyr_std/stretch.h index 0525a01..066a8ed 100644 --- a/synfig-core/trunk/src/modules/lyr_std/stretch.h +++ b/synfig-core/trunk/src/modules/lyr_std/stretch.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file colorcorrect.h ** \brief Template Header ** @@ -21,13 +21,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_STRETCH_H -#define __SINFG_LAYER_STRETCH_H +#ifndef __SYNFIG_LAYER_STRETCH_H +#define __SYNFIG_LAYER_STRETCH_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include /* === M A C R O S ========================================================= */ @@ -36,11 +36,11 @@ /* === C L A S S E S & S T R U C T S ======================================= */ class Stretch_Trans; -namespace sinfg { +namespace synfig { class Layer_Stretch : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class Stretch_Trans; private: @@ -52,20 +52,20 @@ public: Layer_Stretch(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; - virtual etl::handle get_transform()const; + virtual etl::handle get_transform()const; }; // END of class Layer_Stretch -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/supersample.cpp b/synfig-core/trunk/src/modules/lyr_std/supersample.cpp index 3c55cde..1a07899 100644 --- a/synfig-core/trunk/src/modules/lyr_std/supersample.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/supersample.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: supersample.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -28,17 +28,17 @@ #endif #include "supersample.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #endif @@ -46,12 +46,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(SuperSample); -SINFG_LAYER_SET_NAME(SuperSample,"super_sample"); -SINFG_LAYER_SET_LOCAL_NAME(SuperSample,_("Super Sample")); -SINFG_LAYER_SET_CATEGORY(SuperSample,_("Other")); -SINFG_LAYER_SET_VERSION(SuperSample,"0.1"); -SINFG_LAYER_SET_CVS_ID(SuperSample,"$Id: supersample.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(SuperSample); +SYNFIG_LAYER_SET_NAME(SuperSample,"super_sample"); +SYNFIG_LAYER_SET_LOCAL_NAME(SuperSample,_("Super Sample")); +SYNFIG_LAYER_SET_CATEGORY(SuperSample,_("Other")); +SYNFIG_LAYER_SET_VERSION(SuperSample,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(SuperSample,"$Id: supersample.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/lyr_std/supersample.h b/synfig-core/trunk/src/modules/lyr_std/supersample.h index 527d3ff..2b13859 100644 --- a/synfig-core/trunk/src/modules/lyr_std/supersample.h +++ b/synfig-core/trunk/src/modules/lyr_std/supersample.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: supersample.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,12 +20,12 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SUPERSAMPLE_H -#define __SINFG_SUPERSAMPLE_H +#ifndef __SYNFIG_SUPERSAMPLE_H +#define __SYNFIG_SUPERSAMPLE_H /* === H E A D E R S ======================================================= */ -#include +#include /* === M A C R O S ========================================================= */ @@ -33,13 +33,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class SuperSample : public sinfg::Layer +class SuperSample : public synfig::Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: int width, height; @@ -47,12 +47,12 @@ private: public: SuperSample(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - virtual sinfg::Rect get_bounding_rect(Context context)const; + virtual synfig::Rect get_bounding_rect(Context context)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp index 2a12ddf..e2cf834 100644 --- a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Image Layer_TimeLoop Layer Implementation ** $Id: timeloop.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -28,15 +28,15 @@ #endif #include "timeloop.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -44,12 +44,12 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_TimeLoop); -SINFG_LAYER_SET_NAME(Layer_TimeLoop,"timeloop"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_TimeLoop,_("TimeLoop")); -SINFG_LAYER_SET_CATEGORY(Layer_TimeLoop,_("Other")); -SINFG_LAYER_SET_VERSION(Layer_TimeLoop,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_TimeLoop,"$Id: timeloop.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_TimeLoop); +SYNFIG_LAYER_SET_NAME(Layer_TimeLoop,"timeloop"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_TimeLoop,_("TimeLoop")); +SYNFIG_LAYER_SET_CATEGORY(Layer_TimeLoop,_("Other")); +SYNFIG_LAYER_SET_VERSION(Layer_TimeLoop,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_TimeLoop,"$Id: timeloop.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/lyr_std/timeloop.h b/synfig-core/trunk/src/modules/lyr_std/timeloop.h index d9ed226..1c014e9 100644 --- a/synfig-core/trunk/src/modules/lyr_std/timeloop.h +++ b/synfig-core/trunk/src/modules/lyr_std/timeloop.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file timeloop.h ** \brief Template Header ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TIMELOOP_H -#define __SINFG_TIMELOOP_H +#ifndef __SYNFIG_TIMELOOP_H +#define __SYNFIG_TIMELOOP_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -37,13 +37,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Layer_TimeLoop : public sinfg::Layer +class Layer_TimeLoop : public synfig::Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Time start_time; - sinfg::Time end_time; + synfig::Time start_time; + synfig::Time end_time; protected: Layer_TimeLoop(); @@ -51,15 +51,15 @@ protected: public: ~Layer_TimeLoop(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; virtual Vocab get_param_vocab()const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - virtual void set_time(sinfg::Context context, sinfg::Time time)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + virtual void set_time(synfig::Context context, synfig::Time time)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/translate.cpp b/synfig-core/trunk/src/modules/lyr_std/translate.cpp index 63ec3a2..e126121 100644 --- a/synfig-core/trunk/src/modules/lyr_std/translate.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/translate.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: translate.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $ ** @@ -28,16 +28,16 @@ #endif #include "translate.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -45,12 +45,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Translate); -SINFG_LAYER_SET_NAME(Translate,"translate"); -SINFG_LAYER_SET_LOCAL_NAME(Translate,_("Translate")); -SINFG_LAYER_SET_CATEGORY(Translate,_("Transform")); -SINFG_LAYER_SET_VERSION(Translate,"0.1"); -SINFG_LAYER_SET_CVS_ID(Translate,"$Id: translate.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_INIT(Translate); +SYNFIG_LAYER_SET_NAME(Translate,"translate"); +SYNFIG_LAYER_SET_LOCAL_NAME(Translate,_("Translate")); +SYNFIG_LAYER_SET_CATEGORY(Translate,_("Transform")); +SYNFIG_LAYER_SET_VERSION(Translate,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Translate,"$Id: translate.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -97,8 +97,8 @@ Translate::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Translate::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Translate::hit_check(synfig::Context context, const synfig::Point &pos)const { return context.hit_check(pos-origin); } @@ -115,12 +115,12 @@ class Translate_Trans : public Transform public: Translate_Trans(const Translate* x):Transform(x->get_guid()),layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { return x+layer->origin; } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { return x-layer->origin; } diff --git a/synfig-core/trunk/src/modules/lyr_std/translate.h b/synfig-core/trunk/src/modules/lyr_std/translate.h index 5dfaa43..c642f3b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/translate.h +++ b/synfig-core/trunk/src/modules/lyr_std/translate.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: translate.h,v 1.2 2005/01/24 03:08:17 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRANSLATE_H -#define __SINFG_TRANSLATE_H +#ifndef __SYNFIG_TRANSLATE_H +#define __SYNFIG_TRANSLATE_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -43,7 +43,7 @@ class Translate_Trans; class Translate : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class Translate_Trans; private: Vector origin; @@ -51,14 +51,14 @@ public: Translate(); ~Translate(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; virtual Vocab get_param_vocab()const; - virtual sinfg::Rect get_full_bounding_rect(Context context)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; - virtual etl::handle get_transform()const; + virtual synfig::Rect get_full_bounding_rect(Context context)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; + virtual etl::handle get_transform()const; }; diff --git a/synfig-core/trunk/src/modules/lyr_std/twirl.cpp b/synfig-core/trunk/src/modules/lyr_std/twirl.cpp index 634ff4d..1248fcc 100644 --- a/synfig-core/trunk/src/modules/lyr_std/twirl.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/twirl.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file spiralgradient.cpp ** \brief Template Header ** @@ -28,15 +28,15 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "twirl.h" #endif @@ -45,16 +45,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Twirl); -SINFG_LAYER_SET_NAME(Twirl,"twirl"); -SINFG_LAYER_SET_LOCAL_NAME(Twirl,_("Twirl")); -SINFG_LAYER_SET_CATEGORY(Twirl,_("Distortions")); -SINFG_LAYER_SET_VERSION(Twirl,"0.1"); -SINFG_LAYER_SET_CVS_ID(Twirl,"$Id: twirl.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Twirl); +SYNFIG_LAYER_SET_NAME(Twirl,"twirl"); +SYNFIG_LAYER_SET_LOCAL_NAME(Twirl,_("Twirl")); +SYNFIG_LAYER_SET_CATEGORY(Twirl,_("Distortions")); +SYNFIG_LAYER_SET_VERSION(Twirl,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Twirl,"$Id: twirl.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -131,8 +131,8 @@ Twirl::get_param_vocab()const return ret; } -sinfg::Point -Twirl::distort(const sinfg::Point &pos,bool reverse)const +synfig::Point +Twirl::distort(const synfig::Point &pos,bool reverse)const { Point centered(pos-center); Real mag(centered.mag()); @@ -156,8 +156,8 @@ Twirl::distort(const sinfg::Point &pos,bool reverse)const return twirled+center; } -sinfg::Layer::Handle -Twirl::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Twirl::hit_check(synfig::Context context, const synfig::Point &pos)const { return context.hit_check(distort(pos)); } @@ -174,12 +174,12 @@ class Twirl_Trans : public Transform public: Twirl_Trans(const Twirl* x):Transform(x->get_guid()),layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { return layer->distort(x,true); } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { return layer->distort(x,false); } diff --git a/synfig-core/trunk/src/modules/lyr_std/twirl.h b/synfig-core/trunk/src/modules/lyr_std/twirl.h index c19683f..3914123 100644 --- a/synfig-core/trunk/src/modules/lyr_std/twirl.h +++ b/synfig-core/trunk/src/modules/lyr_std/twirl.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file twirl.h ** \brief Template Header ** @@ -21,17 +21,17 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TWIRL_H -#define __SINFG_TWIRL_H +#ifndef __SYNFIG_TWIRL_H +#define __SYNFIG_TWIRL_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -40,40 +40,40 @@ /* === C L A S S E S & S T R U C T S ======================================= */ class Twirl_Trans; -class Twirl : public sinfg::Layer_Composite +class Twirl : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class Twirl_Trans; private: - sinfg::Point center; + synfig::Point center; - sinfg::Real radius; + synfig::Real radius; - sinfg::Angle rotations; + synfig::Angle rotations; bool distort_inside; bool distort_outside; - sinfg::Point distort(const sinfg::Point &pos, bool reverse=false)const; + synfig::Point distort(const synfig::Point &pos, bool reverse=false)const; public: Twirl(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - //virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + //virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; - virtual etl::handle get_transform()const; + virtual etl::handle get_transform()const; }; // END of class Twirl /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/warp.cpp b/synfig-core/trunk/src/modules/lyr_std/warp.cpp index 24c42c7..cf80c7b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/warp.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/warp.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: warp.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $ ** @@ -28,15 +28,15 @@ #endif #include "warp.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #endif @@ -45,12 +45,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Warp); -SINFG_LAYER_SET_NAME(Warp,"warp"); -SINFG_LAYER_SET_LOCAL_NAME(Warp,_("Warp")); -SINFG_LAYER_SET_CATEGORY(Warp,_("Distortions")); -SINFG_LAYER_SET_VERSION(Warp,"0.1"); -SINFG_LAYER_SET_CVS_ID(Warp,"$Id: warp.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); +SYNFIG_LAYER_INIT(Warp); +SYNFIG_LAYER_SET_NAME(Warp,"warp"); +SYNFIG_LAYER_SET_LOCAL_NAME(Warp,_("Warp")); +SYNFIG_LAYER_SET_CATEGORY(Warp,_("Distortions")); +SYNFIG_LAYER_SET_VERSION(Warp,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Warp,"$Id: warp.cpp,v 1.2 2005/01/24 05:00:18 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -409,14 +409,14 @@ class Warp_Trans : public Transform public: Warp_Trans(const Warp* x):Transform(x->get_guid()),layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { return layer->transform_backward(x); //Point pos(x-layer->origin); //return Point(layer->cos_val*pos[0]-layer->sin_val*pos[1],layer->sin_val*pos[0]+layer->cos_val*pos[1])+layer->origin; } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { return layer->transform_forward(x); @@ -430,8 +430,8 @@ Warp::get_transform()const return new Warp_Trans(this); } -sinfg::Layer::Handle -Warp::hit_check(sinfg::Context context, const sinfg::Point &p)const +synfig::Layer::Handle +Warp::hit_check(synfig::Context context, const synfig::Point &p)const { Point newpos(transform_forward(p)); @@ -588,8 +588,8 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren ; swap(tl[1],br[1]);*/ - //sinfg::warning("given window: [%f,%f]-[%f,%f] %dx%d",tl[0],tl[1],br[0],br[1],renddesc.get_w(),renddesc.get_h()); - //sinfg::warning("Projected: [%f,%f]-[%f,%f]",bounding_rect.get_min()[0],bounding_rect.get_min()[1],bounding_rect.get_max()[0],bounding_rect.get_max()[1]); + //synfig::warning("given window: [%f,%f]-[%f,%f] %dx%d",tl[0],tl[1],br[0],br[1],renddesc.get_w(),renddesc.get_h()); + //synfig::warning("Projected: [%f,%f]-[%f,%f]",bounding_rect.get_min()[0],bounding_rect.get_min()[1],bounding_rect.get_max()[0],bounding_rect.get_max()[1]); // If we are clipping, then go ahead and clip to the // source rectangle @@ -641,7 +641,7 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren desc.set_br(br); desc.set_wh(ceil_to_int(src_pw*(br[0]-tl[0])),ceil_to_int(src_ph*(br[1]-tl[1]))); - //sinfg::warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h()); + //synfig::warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h()); if(desc.get_w()==0 && desc.get_h()==0) { surface->set_wh(renddesc.get_w(),renddesc.get_h()); @@ -786,13 +786,13 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren return true; } -sinfg::Rect +synfig::Rect Warp::get_bounding_rect()const { return Rect::full_plane(); } -sinfg::Rect +synfig::Rect Warp::get_full_bounding_rect(Context context)const { // return Rect::full_plane(); diff --git a/synfig-core/trunk/src/modules/lyr_std/warp.h b/synfig-core/trunk/src/modules/lyr_std/warp.h index a85a6cf..abb767b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/warp.h +++ b/synfig-core/trunk/src/modules/lyr_std/warp.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: warp.h,v 1.2 2005/01/24 05:00:18 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_WARP_H -#define __SINFG_WARP_H +#ifndef __SYNFIG_WARP_H +#define __SYNFIG_WARP_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -36,14 +36,14 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class Warp_Trans; class Warp : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class Warp_Trans; private: @@ -70,16 +70,16 @@ public: Warp(); ~Warp(); - virtual sinfg::Rect get_full_bounding_rect(sinfg::Context context)const; - virtual sinfg::Rect get_bounding_rect()const; + virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const; + virtual synfig::Rect get_bounding_rect()const; - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); - virtual ValueBase get_param(const sinfg::String & param)const; + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); + virtual ValueBase get_param(const synfig::String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; - virtual etl::handle get_transform()const; + virtual etl::handle get_transform()const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp index 8bfaa8a..702cc35 100644 --- a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: xorpattern.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -29,14 +29,14 @@ #include "xorpattern.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -44,12 +44,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(XORPattern); -SINFG_LAYER_SET_NAME(XORPattern,"XORPattern"); -SINFG_LAYER_SET_LOCAL_NAME(XORPattern,_("XOR Pattern")); -SINFG_LAYER_SET_CATEGORY(XORPattern,_("Other")); -SINFG_LAYER_SET_VERSION(XORPattern,"0.1"); -SINFG_LAYER_SET_CVS_ID(XORPattern,"$Id: xorpattern.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(XORPattern); +SYNFIG_LAYER_SET_NAME(XORPattern,"XORPattern"); +SYNFIG_LAYER_SET_LOCAL_NAME(XORPattern,_("XOR Pattern")); +SYNFIG_LAYER_SET_CATEGORY(XORPattern,_("Other")); +SYNFIG_LAYER_SET_VERSION(XORPattern,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(XORPattern,"$Id: xorpattern.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/lyr_std/xorpattern.h b/synfig-core/trunk/src/modules/lyr_std/xorpattern.h index 22dc4ac..2aed723 100644 --- a/synfig-core/trunk/src/modules/lyr_std/xorpattern.h +++ b/synfig-core/trunk/src/modules/lyr_std/xorpattern.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: xorpattern.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_XORPATTERN_H -#define __SINFG_XORPATTERN_H +#ifndef __SYNFIG_XORPATTERN_H +#define __SYNFIG_XORPATTERN_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -36,13 +36,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class XORPattern : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: diff --git a/synfig-core/trunk/src/modules/lyr_std/zoom.cpp b/synfig-core/trunk/src/modules/lyr_std/zoom.cpp index 1d632a1..a1a06ce 100644 --- a/synfig-core/trunk/src/modules/lyr_std/zoom.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/zoom.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file zoom.cpp ** \brief writeme ** @@ -29,15 +29,15 @@ #endif #include "zoom.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -45,12 +45,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Zoom); -SINFG_LAYER_SET_NAME(Zoom,"zoom"); -SINFG_LAYER_SET_LOCAL_NAME(Zoom,_("Zoom")); -SINFG_LAYER_SET_CATEGORY(Zoom,_("Transform")); -SINFG_LAYER_SET_VERSION(Zoom,"0.1"); -SINFG_LAYER_SET_CVS_ID(Zoom,"$Id: zoom.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_INIT(Zoom); +SYNFIG_LAYER_SET_NAME(Zoom,"zoom"); +SYNFIG_LAYER_SET_LOCAL_NAME(Zoom,_("Zoom")); +SYNFIG_LAYER_SET_CATEGORY(Zoom,_("Transform")); +SYNFIG_LAYER_SET_VERSION(Zoom,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Zoom,"$Id: zoom.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -104,8 +104,8 @@ Zoom::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Zoom::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Zoom::hit_check(synfig::Context context, const synfig::Point &pos)const { return context.hit_check((pos-center)/exp(amount)+center); } @@ -122,12 +122,12 @@ class Zoom_Trans : public Transform public: Zoom_Trans(const Zoom* x):Transform(x->get_guid()),layer(x) { } - sinfg::Vector perform(const sinfg::Vector& x)const + synfig::Vector perform(const synfig::Vector& x)const { return (x-layer->center)*exp(layer->amount)+layer->center; } - sinfg::Vector unperform(const sinfg::Vector& x)const + synfig::Vector unperform(const synfig::Vector& x)const { return (x-layer->center)/exp(layer->amount)+layer->center; } @@ -154,8 +154,8 @@ Zoom::accelerated_render(Context context,Surface *surface,int quality, const Ren return context.accelerated_render(surface,quality,desc,cb); } -sinfg::Rect -Zoom::get_full_bounding_rect(sinfg::Context context)const +synfig::Rect +Zoom::get_full_bounding_rect(synfig::Context context)const { return context.get_full_bounding_rect(); } diff --git a/synfig-core/trunk/src/modules/lyr_std/zoom.h b/synfig-core/trunk/src/modules/lyr_std/zoom.h index 3a30194..ffb3e75 100644 --- a/synfig-core/trunk/src/modules/lyr_std/zoom.h +++ b/synfig-core/trunk/src/modules/lyr_std/zoom.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file zoom.h ** \brief writeme ** @@ -21,13 +21,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_ZOOM_H -#define __SINFG_ZOOM_H +#ifndef __SYNFIG_ZOOM_H +#define __SYNFIG_ZOOM_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -43,7 +43,7 @@ class Zoom_Trans; class Zoom : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class Zoom_Trans; private: Vector center; @@ -51,14 +51,14 @@ private: public: Zoom(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; - virtual sinfg::Rect get_full_bounding_rect(sinfg::Context context)const; - virtual etl::handle get_transform()const; + virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const; + virtual etl::handle get_transform()const; }; diff --git a/synfig-core/trunk/src/modules/mod_bmp/Makefile.am b/synfig-core/trunk/src/modules/mod_bmp/Makefile.am index f005c03..a2fa692 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_bmp/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_bmp/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_bmp/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -9,5 +9,5 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_bmp.la libmod_bmp_la_SOURCES = main.cpp trgt_bmp.cpp trgt_bmp.h mptr_bmp.cpp mptr_bmp.h libmod_bmp_la_LDFLAGS = -module -no-undefined -libmod_bmp_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_bmp_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_bmp_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_bmp_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ diff --git a/synfig-core/trunk/src/modules/mod_bmp/main.cpp b/synfig-core/trunk/src/modules/mod_bmp/main.cpp index 5e9116e..17628b7 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/main.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/main.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file main.cpp ** \brief writeme ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -30,8 +30,8 @@ # include #endif -#include -#include +#include +#include #include "trgt_bmp.h" #include "mptr_bmp.h" @@ -44,7 +44,7 @@ MODULE_DESC_BEGIN(mod_bmp) MODULE_DESCRIPTION("Provides a Microsoft BMP output target and importer") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_bmp) diff --git a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp index e85e8d6..624bace 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bmp Target Module ** $Id: mptr_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -30,8 +30,8 @@ #endif #include "mptr_bmp.h" -#include -#include +#include +#include #include #include @@ -39,17 +39,17 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(bmp_mptr); -SINFG_IMPORTER_SET_NAME(bmp_mptr,"bmp_mptr"); -SINFG_IMPORTER_SET_EXT(bmp_mptr,"bmp"); -SINFG_IMPORTER_SET_VERSION(bmp_mptr,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(bmp_mptr,"$Id: mptr_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_IMPORTER_INIT(bmp_mptr); +SYNFIG_IMPORTER_SET_NAME(bmp_mptr,"bmp_mptr"); +SYNFIG_IMPORTER_SET_EXT(bmp_mptr,"bmp"); +SYNFIG_IMPORTER_SET_VERSION(bmp_mptr,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(bmp_mptr,"$Id: mptr_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -118,13 +118,13 @@ bmp_mptr::~bmp_mptr() } bool -bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) +bmp_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) { FILE *file=fopen(filename.c_str(),"rb"); if(!file) { if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); - else sinfg::error("bmp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); + else synfig::error("bmp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); return false; } @@ -136,7 +136,7 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) if(b_char!='B' || m_char!='M') { if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("%s is not in BMP format"),filename.c_str())); - else sinfg::error("bmp_mptr::GetFrame(): "+strprintf(_("%s is not in BMP format"),filename.c_str())); + else synfig::error("bmp_mptr::GetFrame(): "+strprintf(_("%s is not in BMP format"),filename.c_str())); return false; } @@ -144,7 +144,7 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) { String str("bmp_mptr::get_frame(): "+strprintf(_("Failure while reading BITMAPFILEHEADER from %s"),filename.c_str())); if(cb)cb->error(str); - else sinfg::error(str); + else synfig::error(str); return false; } @@ -152,7 +152,7 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) { String str("bmp_mptr::get_frame(): "+strprintf(_("Failure while reading BITMAPINFOHEADER from %s"),filename.c_str())); if(cb)cb->error(str); - else sinfg::error(str); + else synfig::error(str); return false; } @@ -162,7 +162,7 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) { String str("bmp_mptr::get_frame(): "+strprintf(_("Bad BITMAPFILEHEADER in %s. (bfOffsetBits=%d, should be %d)"),filename.c_str(),offset,sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER)-2)); if(cb)cb->error(str); - else sinfg::error(str); + else synfig::error(str); return false; } @@ -170,7 +170,7 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) { String str("bmp_mptr::get_frame(): "+strprintf(_("Bad BITMAPINFOHEADER in %s. (biSize=%d, should be 40)"),filename.c_str(),little_endian(infoheader.biSize))); if(cb)cb->error(str); - else sinfg::error(str); + else synfig::error(str); return false; } @@ -180,21 +180,21 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) h=little_endian(infoheader.biHeight); bit_count=little_endian_short(infoheader.biBitCount); - sinfg::warning("w:%d\n",w); - sinfg::warning("h:%d\n",h); - sinfg::warning("bit_count:%d\n",bit_count); + synfig::warning("w:%d\n",w); + synfig::warning("h:%d\n",h); + synfig::warning("bit_count:%d\n",bit_count); if(little_endian(infoheader.biCompression)) { if(cb)cb->error("bmp_mptr::GetFrame(): "+string(_("Reading compressed bitmaps is not supported"))); - else sinfg::error("bmp_mptr::GetFrame(): "+string(_("Reading compressed bitmaps is not supported"))); + else synfig::error("bmp_mptr::GetFrame(): "+string(_("Reading compressed bitmaps is not supported"))); return false; } if(bit_count!=24 && bit_count!=32) { if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("Unsupported bit depth (bit_count=%d, should be 24 or 32)"),bit_count)); - else sinfg::error("bmp_mptr::GetFrame(): "+strprintf(_("Unsupported bit depth (bit_count=%d, should be 24 or 32)"),bit_count)); + else synfig::error("bmp_mptr::GetFrame(): "+strprintf(_("Unsupported bit depth (bit_count=%d, should be 24 or 32)"),bit_count)); return false; } diff --git a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h index f7c3e8a..60012cc 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h +++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: mptr_bmp.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MPTR_PPM_H -#define __SINFG_MPTR_PPM_H +#ifndef __SYNFIG_MPTR_PPM_H +#define __SYNFIG_MPTR_PPM_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -36,18 +36,18 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class bmp_mptr : public sinfg::Importer +class bmp_mptr : public synfig::Importer { -SINFG_IMPORTER_MODULE_EXT +SYNFIG_IMPORTER_MODULE_EXT private: - sinfg::String filename; + synfig::String filename; public: bmp_mptr(const char *filename); ~bmp_mptr(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp index 1a45339..e8b828f 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file trgt_bmp.cpp ** \brief Bitmap Target ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -31,7 +31,7 @@ #endif #include "trgt_bmp.h" -#include +#include #include #include @@ -40,17 +40,17 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === I N F O ============================================================= */ -SINFG_TARGET_INIT(bmp); -SINFG_TARGET_SET_NAME(bmp,"bmp"); -SINFG_TARGET_SET_EXT(bmp,"bmp"); -SINFG_TARGET_SET_VERSION(bmp,"0.1"); -SINFG_TARGET_SET_CVS_ID(bmp,"$Id: trgt_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_TARGET_INIT(bmp); +SYNFIG_TARGET_SET_NAME(bmp,"bmp"); +SYNFIG_TARGET_SET_EXT(bmp,"bmp"); +SYNFIG_TARGET_SET_VERSION(bmp,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(bmp,"$Id: trgt_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === C L A S S E S & S T R U C T S ======================================= */ @@ -164,7 +164,7 @@ bmp::end_frame() } bool -bmp::start_frame(sinfg::ProgressCallback *callback) +bmp::start_frame(synfig::ProgressCallback *callback) { int w=desc.get_w(),h=desc.get_h(); @@ -190,7 +190,7 @@ bmp::start_frame(sinfg::ProgressCallback *callback) if(!file) { if(callback)callback->error(_("Unable to open file")); - else sinfg::error(_("Unable to open file")); + else synfig::error(_("Unable to open file")); return false; } @@ -221,14 +221,14 @@ bmp::start_frame(sinfg::ProgressCallback *callback) if(!fwrite(&fileheader.bfSize,sizeof(BITMAPFILEHEADER)-4,1,file)) { if(callback)callback->error(_("Unable to write file header to file")); - else sinfg::error(_("Unable to write file header to file")); + else synfig::error(_("Unable to write file header to file")); return false; } if(!fwrite(&infoheader,sizeof(BITMAPINFOHEADER),1,file)) { if(callback)callback->error(_("Unable to write info header")); - else sinfg::error(_("Unable to write info header")); + else synfig::error(_("Unable to write info header")); return false; } diff --git a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.h b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.h index 7f6800d..828299f 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.h +++ b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file trgt_bmp.h ** \brief Template Header ** @@ -21,13 +21,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_BMP_H -#define __SINFG_TRGT_BMP_H +#ifndef __SYNFIG_TRGT_BMP_H +#define __SYNFIG_TRGT_BMP_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -36,27 +36,27 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class bmp : public sinfg::Target_Scanline +class bmp : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: int rowspan; int imagecount; bool multi_image; FILE *file; - sinfg::String filename; + synfig::String filename; unsigned char *buffer; - sinfg::Color *color_buffer; - sinfg::PixelFormat pf; + synfig::Color *color_buffer; + synfig::PixelFormat pf; public: bmp(const char *filename); virtual ~bmp(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_dv/Makefile.am b/synfig-core/trunk/src/modules/mod_dv/Makefile.am index 1bc3b10..bcd6b98 100644 --- a/synfig-core/trunk/src/modules/mod_dv/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_dv/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_dv/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_dv/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -10,7 +10,7 @@ if WITH_LIBDV module_LTLIBRARIES = libmod_dv.la libmod_dv_la_SOURCES = main.cpp trgt_dv.cpp trgt_dv.h libmod_dv_la_LDFLAGS = -module -no-undefined -libmod_dv_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_dv_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_dv_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_dv_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ else endif diff --git a/synfig-core/trunk/src/modules/mod_dv/main.cpp b/synfig-core/trunk/src/modules/mod_dv/main.cpp index 6e841b0..5b5b969 100644 --- a/synfig-core/trunk/src/modules/mod_dv/main.cpp +++ b/synfig-core/trunk/src/modules/mod_dv/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "trgt_dv.h" #endif @@ -40,7 +40,7 @@ MODULE_DESC_BEGIN(mod_dv) MODULE_DESCRIPTION("Provides a DV Stream target (ie: for miniDV stuff)") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_dv) diff --git a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp index 98c6988..e92975d 100644 --- a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp +++ b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: trgt_dv.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -40,17 +40,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(dv_trgt); -SINFG_TARGET_SET_NAME(dv_trgt,"dv"); -SINFG_TARGET_SET_EXT(dv_trgt,"dv"); -SINFG_TARGET_SET_VERSION(dv_trgt,"0.1"); -SINFG_TARGET_SET_CVS_ID(dv_trgt,"$Id: trgt_dv.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_TARGET_INIT(dv_trgt); +SYNFIG_TARGET_SET_NAME(dv_trgt,"dv"); +SYNFIG_TARGET_SET_EXT(dv_trgt,"dv"); +SYNFIG_TARGET_SET_VERSION(dv_trgt,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(dv_trgt,"$Id: trgt_dv.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -128,7 +128,7 @@ dv_trgt::init() if(!file) { - sinfg::error(_("Unable to open pipe to encodedv")); + synfig::error(_("Unable to open pipe to encodedv")); return false; } @@ -147,7 +147,7 @@ dv_trgt::end_frame() } bool -dv_trgt::start_frame(sinfg::ProgressCallback *callback) +dv_trgt::start_frame(synfig::ProgressCallback *callback) { int w=desc.get_w(),h=desc.get_h(); diff --git a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.h b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.h index b2113bc..070caff 100644 --- a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.h +++ b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_dv.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,13 +20,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_DV_H -#define __SINFG_TRGT_DV_H +#ifndef __SYNFIG_TRGT_DV_H +#define __SYNFIG_TRGT_DV_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -36,27 +36,27 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class dv_trgt : public sinfg::Target_Scanline +class dv_trgt : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: int imagecount; bool wide_aspect; FILE *file; - sinfg::String filename; + synfig::String filename; unsigned char *buffer; - sinfg::Color *color_buffer; + synfig::Color *color_buffer; public: dv_trgt(const char *filename); virtual ~dv_trgt(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); + virtual bool set_rend_desc(synfig::RendDesc *desc); virtual bool init(); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am b/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am index 2cf5fc7..97c801f 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_ffmpeg/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_ffmpeg/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -10,8 +10,8 @@ if WITH_FFMPEG module_LTLIBRARIES = libmod_ffmpeg.la libmod_ffmpeg_la_SOURCES = main.cpp mptr_ffmpeg.cpp mptr_ffmpeg.h trgt_ffmpeg.cpp trgt_ffmpeg.h libmod_ffmpeg_la_LDFLAGS = -module -no-undefined -libmod_ffmpeg_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_ffmpeg_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_ffmpeg_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_ffmpeg_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ else endif diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/main.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/main.cpp index 757e49c..d958325 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/main.cpp +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "mptr_ffmpeg.h" #include "trgt_ffmpeg.h" #endif @@ -41,7 +41,7 @@ MODULE_DESC_BEGIN(mod_ffmpeg) MODULE_DESCRIPTION("Provides output targets for each format that FFMPEG supports") MODULE_AUTHOR("Robert B. Quattlebaum Jr.") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_ffmpeg) diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp index 430f95b..82cf757 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: mptr_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -38,17 +38,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(ffmpeg_mptr); -SINFG_IMPORTER_SET_NAME(ffmpeg_mptr,"ffmpeg"); -SINFG_IMPORTER_SET_EXT(ffmpeg_mptr,"avi"); -SINFG_IMPORTER_SET_VERSION(ffmpeg_mptr,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(ffmpeg_mptr,"$Id: mptr_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_IMPORTER_INIT(ffmpeg_mptr); +SYNFIG_IMPORTER_SET_NAME(ffmpeg_mptr,"ffmpeg"); +SYNFIG_IMPORTER_SET_EXT(ffmpeg_mptr,"avi"); +SYNFIG_IMPORTER_SET_VERSION(ffmpeg_mptr,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(ffmpeg_mptr,"$Id: mptr_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -163,7 +163,7 @@ ffmpeg_mptr::~ffmpeg_mptr() } bool -ffmpeg_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCallback *) +ffmpeg_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *) { int i=(int)(time*fps); if(i!=cur_frame) diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h index 45a6ec8..64afa4d 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: mptr_ffmpeg.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,12 +20,12 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MPTR_FFMPEG_H -#define __SINFG_MPTR_FFMPEG_H +#ifndef __SYNFIG_MPTR_FFMPEG_H +#define __SYNFIG_MPTR_FFMPEG_H /* === H E A D E R S ======================================================= */ -#include +#include #include #include "string.h" #ifdef HAVE_TERMIOS_H @@ -33,22 +33,22 @@ #endif -#include +#include /* === M A C R O S ========================================================= */ /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ -class ffmpeg_mptr : public sinfg::Importer +class ffmpeg_mptr : public synfig::Importer { - SINFG_IMPORTER_MODULE_EXT + SYNFIG_IMPORTER_MODULE_EXT public: private: - sinfg::String filename; + synfig::String filename; FILE *file; int cur_frame; - sinfg::Surface frame; + synfig::Surface frame; float fps; #ifdef HAVE_TERMIOS_H struct termios oldtty; @@ -62,7 +62,7 @@ public: ~ffmpeg_mptr(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp index 46276f6..c3bce70 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: trgt_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -40,17 +40,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(ffmpeg_trgt); -SINFG_TARGET_SET_NAME(ffmpeg_trgt,"ffmpeg"); -SINFG_TARGET_SET_EXT(ffmpeg_trgt,"mpg"); -SINFG_TARGET_SET_VERSION(ffmpeg_trgt,"0.1"); -SINFG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id: trgt_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_TARGET_INIT(ffmpeg_trgt); +SYNFIG_TARGET_SET_NAME(ffmpeg_trgt,"ffmpeg"); +SYNFIG_TARGET_SET_EXT(ffmpeg_trgt,"mpg"); +SYNFIG_TARGET_SET_VERSION(ffmpeg_trgt,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(ffmpeg_trgt,"$Id: trgt_ffmpeg.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -130,7 +130,7 @@ ffmpeg_trgt::init() if(!file) { - sinfg::error(_("Unable to open pipe to ffmpeg")); + synfig::error(_("Unable to open pipe to ffmpeg")); return false; } @@ -146,7 +146,7 @@ ffmpeg_trgt::end_frame() } bool -ffmpeg_trgt::start_frame(sinfg::ProgressCallback *callback) +ffmpeg_trgt::start_frame(synfig::ProgressCallback *callback) { int w=desc.get_w(),h=desc.get_h(); diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.h b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.h index 84ca339..8894661 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.h +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_ffmpeg.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,13 +20,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_FFMPEG_H -#define __SINFG_TRGT_FFMPEG_H +#ifndef __SYNFIG_TRGT_FFMPEG_H +#define __SYNFIG_TRGT_FFMPEG_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -35,27 +35,27 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class ffmpeg_trgt : public sinfg::Target_Scanline +class ffmpeg_trgt : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: int imagecount; bool multi_image; FILE *file; - sinfg::String filename; + synfig::String filename; unsigned char *buffer; - sinfg::Color *color_buffer; + synfig::Color *color_buffer; public: ffmpeg_trgt(const char *filename); - virtual bool set_rend_desc(sinfg::RendDesc *desc); + virtual bool set_rend_desc(synfig::RendDesc *desc); virtual bool init(); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); virtual ~ffmpeg_trgt(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_filter/Makefile.am b/synfig-core/trunk/src/modules/mod_filter/Makefile.am index 6bdbaf6..f51e55f 100644 --- a/synfig-core/trunk/src/modules/mod_filter/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_filter/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_filter/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_filter/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -8,6 +8,6 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_filter.la libmod_filter_la_SOURCES = blur.cpp blur.h colorcorrect.cpp colorcorrect.h halftone2.cpp halftone2.h lumakey.cpp lumakey.h radialblur.cpp radialblur.h main.cpp halftone.cpp halftone.h halftone3.cpp halftone3.h -libmod_filter_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_filter_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_filter_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_filter_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ libmod_filter_la_LDFLAGS = -module -no-undefined diff --git a/synfig-core/trunk/src/modules/mod_filter/blur.cpp b/synfig-core/trunk/src/modules/mod_filter/blur.cpp index c9cabd2..d474013 100644 --- a/synfig-core/trunk/src/modules/mod_filter/blur.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/blur.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file blur.cpp ** \brief Template Header ** @@ -30,22 +30,22 @@ #include "blur.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #endif -using namespace sinfg; +using namespace synfig; using namespace etl; using namespace std; @@ -60,16 +60,16 @@ using namespace std; /* -- G L O B A L S --------------------------------------------------------- */ -SINFG_LAYER_INIT(Blur_Layer); -SINFG_LAYER_SET_NAME(Blur_Layer,"blur"); -SINFG_LAYER_SET_LOCAL_NAME(Blur_Layer,_("Blur")); -SINFG_LAYER_SET_CATEGORY(Blur_Layer,_("Blurs")); -SINFG_LAYER_SET_VERSION(Blur_Layer,"0.2"); -SINFG_LAYER_SET_CVS_ID(Blur_Layer,"$Id: blur.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_INIT(Blur_Layer); +SYNFIG_LAYER_SET_NAME(Blur_Layer,"blur"); +SYNFIG_LAYER_SET_LOCAL_NAME(Blur_Layer,_("Blur")); +SYNFIG_LAYER_SET_CATEGORY(Blur_Layer,_("Blurs")); +SYNFIG_LAYER_SET_VERSION(Blur_Layer,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Blur_Layer,"$Id: blur.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); /* -- F U N C T I O N S ----------------------------------------------------- */ -inline void clamp(sinfg::Vector &v) +inline void clamp(synfig::Vector &v) { if(v[0]<0.0)v[0]=0.0; if(v[1]<0.0)v[1]=0.0; diff --git a/synfig-core/trunk/src/modules/mod_filter/blur.h b/synfig-core/trunk/src/modules/mod_filter/blur.h index d96d48b..d220ef5 100644 --- a/synfig-core/trunk/src/modules/mod_filter/blur.h +++ b/synfig-core/trunk/src/modules/mod_filter/blur.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file blur.h ** \brief Template Header ** @@ -21,38 +21,38 @@ /* === H E A D E R S ======================================================= */ -#ifndef __SINFG_LAYER_BLUR_H__ -#define __SINFG_LAYER_BLUR_H__ +#ifndef __SYNFIG_LAYER_BLUR_H__ +#define __SYNFIG_LAYER_BLUR_H__ /* -- H E A D E R S --------------------------------------------------------- */ -#include -#include -#include -#include +#include +#include +#include +#include -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Blur_Layer : public sinfg::Layer_Composite +class Blur_Layer : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Point size; + synfig::Point size; int type; public: Blur_Layer(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - virtual sinfg::Rect get_full_bounding_rect(Context context)const; + virtual synfig::Rect get_full_bounding_rect(Context context)const; virtual Vocab get_param_vocab()const; }; // END of class Blur diff --git a/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp b/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp index bd8353b..83790e2 100644 --- a/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file colorcorrect.cpp ** \brief Template Header ** @@ -29,14 +29,14 @@ #endif #include "colorcorrect.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -44,16 +44,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_ColorCorrect); -SINFG_LAYER_SET_NAME(Layer_ColorCorrect,"colorcorrect"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_ColorCorrect,_("Color Correct")); -SINFG_LAYER_SET_CATEGORY(Layer_ColorCorrect,_("Filters")); -SINFG_LAYER_SET_VERSION(Layer_ColorCorrect,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_ColorCorrect,"$Id: colorcorrect.cpp,v 1.3 2005/01/24 05:00:18 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_ColorCorrect); +SYNFIG_LAYER_SET_NAME(Layer_ColorCorrect,"colorcorrect"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_ColorCorrect,_("Color Correct")); +SYNFIG_LAYER_SET_CATEGORY(Layer_ColorCorrect,_("Filters")); +SYNFIG_LAYER_SET_VERSION(Layer_ColorCorrect,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_ColorCorrect,"$Id: colorcorrect.cpp,v 1.3 2005/01/24 05:00:18 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/mod_filter/colorcorrect.h b/synfig-core/trunk/src/modules/mod_filter/colorcorrect.h index c089ea6..bfb0ab4 100644 --- a/synfig-core/trunk/src/modules/mod_filter/colorcorrect.h +++ b/synfig-core/trunk/src/modules/mod_filter/colorcorrect.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file colorcorrect.h ** \brief Template Header ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_COLORCORRECT_H -#define __SINFG_LAYER_COLORCORRECT_H +#ifndef __SYNFIG_LAYER_COLORCORRECT_H +#define __SYNFIG_LAYER_COLORCORRECT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -37,11 +37,11 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Layer_ColorCorrect : public Layer { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: @@ -58,7 +58,7 @@ public: Layer_ColorCorrect(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; @@ -71,7 +71,7 @@ public: virtual Vocab get_param_vocab()const; }; // END of class Layer_ColorCorrect -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone.cpp index 1855dc4..7cac70f 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file halftone.cpp ** \brief blehh ** @@ -34,7 +34,7 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -82,7 +82,7 @@ Halftone::operator()(const Point &point, const float& luma, float supersample)co } float -Halftone::mask(sinfg::Point point)const +Halftone::mask(synfig::Point point)const { float radius1; float radius2; diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone.h b/synfig-core/trunk/src/modules/mod_filter/halftone.h index 7b12db2..fba78cf 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone.h +++ b/synfig-core/trunk/src/modules/mod_filter/halftone.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file halftone.h ** \brief Template Header ** @@ -21,13 +21,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_HALFTONE_H -#define __SINFG_HALFTONE_H +#ifndef __SYNFIG_HALFTONE_H +#define __SYNFIG_HALFTONE_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include /* === M A C R O S ========================================================= */ @@ -46,13 +46,13 @@ class Halftone public: int type; - sinfg::Point offset; - sinfg::Vector size; - sinfg::Angle angle; + synfig::Point offset; + synfig::Vector size; + synfig::Angle angle; - float mask(sinfg::Point point)const; + float mask(synfig::Point point)const; - float operator()(const sinfg::Point &point, const float& intensity, float supersample=0)const; + float operator()(const synfig::Point &point, const float& intensity, float supersample=0)const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp index 39df5c5..2114dc0 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file halftone2.cpp ** \brief blehh ** @@ -31,31 +31,31 @@ #include "halftone2.h" #include "halftone.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Halftone2); -SINFG_LAYER_SET_NAME(Halftone2,"halftone2"); -SINFG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone2")); -SINFG_LAYER_SET_CATEGORY(Halftone2,_("Filters")); -SINFG_LAYER_SET_VERSION(Halftone2,"0.0"); -SINFG_LAYER_SET_CVS_ID(Halftone2,"$Id: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Halftone2); +SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2"); +SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone2")); +SYNFIG_LAYER_SET_CATEGORY(Halftone2,_("Filters")); +SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0"); +SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -65,8 +65,8 @@ Halftone2::Halftone2(): color_dark(Color::black()), color_light(Color::white()) { - halftone.offset=(sinfg::Point(0,0)); - halftone.size=(sinfg::Vector(0.25,0.25)); + halftone.offset=(synfig::Point(0,0)); + halftone.size=(synfig::Vector(0.25,0.25)); halftone.angle=(Angle::zero()); halftone.type=TYPE_SYMMETRIC; @@ -92,13 +92,13 @@ Halftone2::color_func(const Point &point, float supersample,const Color& color)c } inline float -Halftone2::calc_supersample(const sinfg::Point &x, float pw,float ph)const +Halftone2::calc_supersample(const synfig::Point &x, float pw,float ph)const { return abs(pw/(halftone.size).mag()); } -sinfg::Layer::Handle -Halftone2::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +Halftone2::hit_check(synfig::Context context, const synfig::Point &point)const { return const_cast(this); } diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.h b/synfig-core/trunk/src/modules/mod_filter/halftone2.h index 8ccb380..9b65b48 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone2.h +++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file halftone2.h ** \brief Template Header ** @@ -21,16 +21,16 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_HALFTONE2_H -#define __SINFG_HALFTONE2_H +#ifndef __SYNFIG_HALFTONE2_H +#define __SYNFIG_HALFTONE2_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "halftone.h" /* === M A C R O S ========================================================= */ @@ -39,30 +39,30 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Halftone2 : public sinfg::Layer_Composite +class Halftone2 : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: Halftone halftone; - sinfg::Color color_dark; - sinfg::Color color_light; + synfig::Color color_dark; + synfig::Color color_light; - sinfg::Color color_func(const sinfg::Point &x, float supersample,const sinfg::Color &under_color)const; + synfig::Color color_func(const synfig::Point &x, float supersample,const synfig::Color &under_color)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; - //float halftone_func(sinfg::Point x)const; + //float halftone_func(synfig::Point x)const; public: Halftone2(); - virtual bool set_param(const sinfg::String ¶m, const sinfg::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String ¶m)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual bool set_param(const synfig::String ¶m, const synfig::ValueBase &value); + virtual synfig::ValueBase get_param(const synfig::String ¶m)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp index 2905c9d..62b76d7 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file halftone3.cpp ** \brief blehh ** @@ -31,31 +31,31 @@ #include "halftone3.h" #include "halftone.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Halftone3); -SINFG_LAYER_SET_NAME(Halftone3,"halftone3"); -SINFG_LAYER_SET_LOCAL_NAME(Halftone3,_("Halftone3")); -SINFG_LAYER_SET_CATEGORY(Halftone3,_("Filters")); -SINFG_LAYER_SET_VERSION(Halftone3,"0.0"); -SINFG_LAYER_SET_CVS_ID(Halftone3,"$Id: halftone3.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Halftone3); +SYNFIG_LAYER_SET_NAME(Halftone3,"halftone3"); +SYNFIG_LAYER_SET_LOCAL_NAME(Halftone3,_("Halftone3")); +SYNFIG_LAYER_SET_CATEGORY(Halftone3,_("Filters")); +SYNFIG_LAYER_SET_VERSION(Halftone3,"0.0"); +SYNFIG_LAYER_SET_CVS_ID(Halftone3,"$Id: halftone3.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -66,14 +66,14 @@ SINFG_LAYER_SET_CVS_ID(Halftone3,"$Id: halftone3.cpp,v 1.1.1.1 2005/01/04 01:23: Halftone3::Halftone3() { - size=(sinfg::Vector(0.25,0.25)); + size=(synfig::Vector(0.25,0.25)); type=TYPE_SYMMETRIC; for(int i=0;i<3;i++) { tone[i].size=size; tone[i].type=type; - tone[i].offset=(sinfg::Point(0,0)); + tone[i].offset=(synfig::Point(0,0)); tone[i].angle=Angle::deg(30.0)*(float)i; } @@ -228,13 +228,13 @@ Halftone3::color_func(const Point &point, float supersample,const Color& in_colo } inline float -Halftone3::calc_supersample(const sinfg::Point &x, float pw,float ph)const +Halftone3::calc_supersample(const synfig::Point &x, float pw,float ph)const { return abs(pw/(tone[0].size).mag()); } -sinfg::Layer::Handle -Halftone3::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +Halftone3::hit_check(synfig::Context context, const synfig::Point &point)const { return const_cast(this); } diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone3.h b/synfig-core/trunk/src/modules/mod_filter/halftone3.h index dcbd40f..bee5b8d 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone3.h +++ b/synfig-core/trunk/src/modules/mod_filter/halftone3.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file halftone3.h ** \brief Template Header ** @@ -21,16 +21,16 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_HALFTONE3_H -#define __SINFG_HALFTONE3_H +#ifndef __SYNFIG_HALFTONE3_H +#define __SYNFIG_HALFTONE3_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "halftone.h" /* === M A C R O S ========================================================= */ @@ -39,35 +39,35 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Halftone3 : public sinfg::Layer_Composite +class Halftone3 : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Vector size; + synfig::Vector size; int type; Halftone tone[3]; - sinfg::Color color[3]; + synfig::Color color[3]; float inverse_matrix[3][3]; bool subtractive; - sinfg::Color color_func(const sinfg::Point &x, float supersample,const sinfg::Color &under_color)const; + synfig::Color color_func(const synfig::Point &x, float supersample,const synfig::Color &under_color)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; - //float halftone_func(sinfg::Point x)const; + //float halftone_func(synfig::Point x)const; void sync(); public: Halftone3(); - virtual bool set_param(const sinfg::String ¶m, const sinfg::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String ¶m)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual bool set_param(const synfig::String ¶m, const synfig::ValueBase &value); + virtual synfig::ValueBase get_param(const synfig::String ¶m)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp b/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp index c102cb3..398bee7 100644 --- a/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file checkerboard.cpp ** \brief Template Header ** @@ -30,19 +30,19 @@ #include "lumakey.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -50,12 +50,12 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(LumaKey); -SINFG_LAYER_SET_NAME(LumaKey,"lumakey"); -SINFG_LAYER_SET_LOCAL_NAME(LumaKey,_("LumaKey")); -SINFG_LAYER_SET_CATEGORY(LumaKey,_("Filters")); -SINFG_LAYER_SET_VERSION(LumaKey,"0.1"); -SINFG_LAYER_SET_CVS_ID(LumaKey,"$Id: lumakey.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(LumaKey); +SYNFIG_LAYER_SET_NAME(LumaKey,"lumakey"); +SYNFIG_LAYER_SET_LOCAL_NAME(LumaKey,_("LumaKey")); +SYNFIG_LAYER_SET_CATEGORY(LumaKey,_("Filters")); +SYNFIG_LAYER_SET_VERSION(LumaKey,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(LumaKey,"$Id: lumakey.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -104,8 +104,8 @@ LumaKey::get_param_vocab()const return ret; } -sinfg::Layer::Handle -LumaKey::hit_check(sinfg::Context context, const sinfg::Point &getpos)const +synfig::Layer::Handle +LumaKey::hit_check(synfig::Context context, const synfig::Point &getpos)const { return context.hit_check(getpos); } diff --git a/synfig-core/trunk/src/modules/mod_filter/lumakey.h b/synfig-core/trunk/src/modules/mod_filter/lumakey.h index 30ebcc9..0bce1ce 100644 --- a/synfig-core/trunk/src/modules/mod_filter/lumakey.h +++ b/synfig-core/trunk/src/modules/mod_filter/lumakey.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Checkerboard Layer ** $Id: lumakey.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LUMAKEY_H -#define __SINFG_LUMAKEY_H +#ifndef __SYNFIG_LUMAKEY_H +#define __SYNFIG_LUMAKEY_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,26 +35,26 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class LumaKey : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class LumaKey : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: public: LumaKey(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; virtual Vocab get_param_vocab()const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; - virtual sinfg::Rect get_bounding_rect(sinfg::Context context)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; + virtual synfig::Rect get_bounding_rect(synfig::Context context)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_filter/main.cpp b/synfig-core/trunk/src/modules/mod_filter/main.cpp index c3f8d69..9015ecb 100644 --- a/synfig-core/trunk/src/modules/mod_filter/main.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,9 +29,9 @@ # include #endif -#include -#include -#include +#include +#include +#include #include "blur.h" #include "colorcorrect.h" @@ -49,7 +49,7 @@ MODULE_DESC_BEGIN(libmod_filter) MODULE_DESCRIPTION("Writeme") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(libmod_filter) diff --git a/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp b/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp index 7471a53..459038a 100644 --- a/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: radialblur.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -28,15 +28,15 @@ #endif #include "radialblur.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #endif @@ -45,12 +45,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(RadialBlur); -SINFG_LAYER_SET_NAME(RadialBlur,"radial_blur"); -SINFG_LAYER_SET_LOCAL_NAME(RadialBlur,_("Radial Blur")); -SINFG_LAYER_SET_CATEGORY(RadialBlur,_("Blurs")); -SINFG_LAYER_SET_VERSION(RadialBlur,"0.1"); -SINFG_LAYER_SET_CVS_ID(RadialBlur,"$Id: radialblur.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(RadialBlur); +SYNFIG_LAYER_SET_NAME(RadialBlur,"radial_blur"); +SYNFIG_LAYER_SET_LOCAL_NAME(RadialBlur,_("Radial Blur")); +SYNFIG_LAYER_SET_CATEGORY(RadialBlur,_("Blurs")); +SYNFIG_LAYER_SET_VERSION(RadialBlur,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(RadialBlur,"$Id: radialblur.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/mod_filter/radialblur.h b/synfig-core/trunk/src/modules/mod_filter/radialblur.h index f7de253..5f7686e 100644 --- a/synfig-core/trunk/src/modules/mod_filter/radialblur.h +++ b/synfig-core/trunk/src/modules/mod_filter/radialblur.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: radialblur.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_RADIALBLUR_H -#define __SINFG_RADIALBLUR_H +#ifndef __SYNFIG_RADIALBLUR_H +#define __SYNFIG_RADIALBLUR_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,13 +35,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class RadialBlur : public Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT friend class RadialBlur_Trans; private: Vector origin; @@ -52,8 +52,8 @@ public: RadialBlur(); ~RadialBlur(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); - virtual ValueBase get_param(const sinfg::String & param)const; + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); + virtual ValueBase get_param(const synfig::String & param)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; virtual Vocab get_param_vocab()const; diff --git a/synfig-core/trunk/src/modules/mod_geometry/Makefile.am b/synfig-core/trunk/src/modules/mod_geometry/Makefile.am index e3cbcfc..355eb00 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_geometry/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_geometry/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_geometry/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -12,6 +12,6 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_geometry.la libmod_geometry_la_SOURCES = rectangle.cpp rectangle.h star.h star.cpp checkerboard.cpp checkerboard.h circle.cpp circle.h region.h region.cpp outline.h outline.cpp main.cpp -libmod_geometry_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_geometry_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_geometry_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_geometry_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ libmod_geometry_la_LDFLAGS = -module -no-undefined diff --git a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp index f514c89..6403403 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file checkerboard.cpp ** \brief Template Header ** @@ -30,19 +30,19 @@ #include "checkerboard.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -50,12 +50,12 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(CheckerBoard); -SINFG_LAYER_SET_NAME(CheckerBoard,"checker_board"); -SINFG_LAYER_SET_LOCAL_NAME(CheckerBoard,_("CheckerBoard")); -SINFG_LAYER_SET_CATEGORY(CheckerBoard,_("Geometry")); -SINFG_LAYER_SET_VERSION(CheckerBoard,"0.1"); -SINFG_LAYER_SET_CVS_ID(CheckerBoard,"$Id: checkerboard.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(CheckerBoard); +SYNFIG_LAYER_SET_NAME(CheckerBoard,"checker_board"); +SYNFIG_LAYER_SET_LOCAL_NAME(CheckerBoard,_("CheckerBoard")); +SYNFIG_LAYER_SET_CATEGORY(CheckerBoard,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(CheckerBoard,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(CheckerBoard,"$Id: checkerboard.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -72,7 +72,7 @@ CheckerBoard::CheckerBoard(): } inline bool -CheckerBoard::point_test(const sinfg::Point& getpos)const +CheckerBoard::point_test(const synfig::Point& getpos)const { int val=((int)((getpos[0]-pos[0])/size[0])+(int)((getpos[1]-pos[1])/size[1])); if(getpos[0]-pos[0] < 0.0) @@ -129,12 +129,12 @@ CheckerBoard::get_param_vocab()const return ret; } -sinfg::Layer::Handle -CheckerBoard::hit_check(sinfg::Context context, const sinfg::Point &getpos)const +synfig::Layer::Handle +CheckerBoard::hit_check(synfig::Context context, const synfig::Point &getpos)const { if(get_amount()!=0.0 && point_test(getpos)) { - sinfg::Layer::Handle tmp; + synfig::Layer::Handle tmp; if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(getpos))) return tmp; if(Color::is_onto(get_blend_method()) && !(tmp=context.hit_check(getpos))) diff --git a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h index 3e14e67..5833085 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h +++ b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Checkerboard Layer ** $Id: checkerboard.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CHECKERBOARD_H -#define __SINFG_CHECKERBOARD_H +#ifndef __SYNFIG_CHECKERBOARD_H +#define __SYNFIG_CHECKERBOARD_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,30 +35,30 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class CheckerBoard : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class CheckerBoard : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Color color; - sinfg::Point pos; - sinfg::Point size; + synfig::Color color; + synfig::Point pos; + synfig::Point size; - bool point_test(const sinfg::Point& x)const; + bool point_test(const synfig::Point& x)const; public: CheckerBoard(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; virtual Vocab get_param_vocab()const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp index 030d0b2..e797fdd 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file circle.cpp ** \brief Template Header ** @@ -29,31 +29,31 @@ #endif #include "circle.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* -- G L O B A L S --------------------------------------------------------- */ -SINFG_LAYER_INIT(Circle); -SINFG_LAYER_SET_NAME(Circle,"circle"); -SINFG_LAYER_SET_LOCAL_NAME(Circle,_("Circle")); -SINFG_LAYER_SET_CATEGORY(Circle,_("Geometry")); -SINFG_LAYER_SET_VERSION(Circle,"0.1"); -SINFG_LAYER_SET_CVS_ID(Circle,"$Id: circle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_INIT(Circle); +SYNFIG_LAYER_SET_NAME(Circle,"circle"); +SYNFIG_LAYER_SET_LOCAL_NAME(Circle,_("Circle")); +SYNFIG_LAYER_SET_CATEGORY(Circle,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(Circle,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Circle,"$Id: circle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); /* -- F U N C T I O N S ----------------------------------------------------- */ @@ -149,8 +149,8 @@ Circle::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Circle::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +Circle::hit_check(synfig::Context context, const synfig::Point &point)const { Point temp=pos-point; @@ -173,7 +173,7 @@ Circle::hit_check(sinfg::Context context, const sinfg::Point &point)const if(in_circle) { - sinfg::Layer::Handle tmp; + synfig::Layer::Handle tmp; if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(point))) return tmp; if(Color::is_onto(get_blend_method()) && !(tmp=context.hit_check(point))) diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.h b/synfig-core/trunk/src/modules/mod_geometry/circle.h index b3651e3..c3a96d8 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/circle.h +++ b/synfig-core/trunk/src/modules/mod_geometry/circle.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file circle.h ** \brief Template Header ** @@ -21,16 +21,16 @@ /* === H E A D E R S ======================================================= */ -#ifndef __SINFG_LAYER_CIRCLE_H__ -#define __SINFG_LAYER_CIRCLE_H__ +#ifndef __SYNFIG_LAYER_CIRCLE_H__ +#define __SYNFIG_LAYER_CIRCLE_H__ /* -- H E A D E R S --------------------------------------------------------- */ -#include -#include -#include +#include +#include +#include -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -40,14 +40,14 @@ using namespace etl; /* -- S T R U C T S & C L A S S E S ----------------------------------------- */ -class Circle : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class Circle : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Color color; - sinfg::Point pos; - sinfg::Real radius; - sinfg::Real feather; + synfig::Color color; + synfig::Point pos; + synfig::Real radius; + synfig::Real feather; bool invert; int falloff; @@ -106,10 +106,10 @@ public: virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - virtual sinfg::Rect get_full_bounding_rect(sinfg::Context context)const; - virtual sinfg::Rect get_bounding_rect()const; + virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const; + virtual synfig::Rect get_bounding_rect()const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/mod_geometry/main.cpp b/synfig-core/trunk/src/modules/mod_geometry/main.cpp index 4aa71bb..2be0626 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/main.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,9 +29,9 @@ # include #endif -#include -#include -#include +#include +#include +#include #include "checkerboard.h" #include "circle.h" @@ -49,7 +49,7 @@ MODULE_DESC_BEGIN(libmod_geometry) MODULE_DESCRIPTION("writeme") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(libmod_geometry) diff --git a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp index e855e91..7144f02 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file bline.cpp ** \brief Template ** @@ -31,21 +31,21 @@ #endif #include "outline.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #endif @@ -57,18 +57,18 @@ using namespace etl; #define ROUND_END_FACTOR (4) #define CUSP_THRESHOLD (0.40) #define SPIKE_AMOUNT (4) -#define NO_LOOP_COOKIE sinfg::Vector(84951305,7836658) +#define NO_LOOP_COOKIE synfig::Vector(84951305,7836658) #define EPSILON (0.000000001) #define CUSP_TANGENT_ADJUST (0.025) /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Outline); -SINFG_LAYER_SET_NAME(Outline,"outline"); -SINFG_LAYER_SET_LOCAL_NAME(Outline,_("Outline")); -SINFG_LAYER_SET_CATEGORY(Outline,_("Geometry")); -SINFG_LAYER_SET_VERSION(Outline,"0.2"); -SINFG_LAYER_SET_CVS_ID(Outline,"$Id: outline.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Outline); +SYNFIG_LAYER_SET_NAME(Outline,"outline"); +SYNFIG_LAYER_SET_LOCAL_NAME(Outline,_("Outline")); +SYNFIG_LAYER_SET_CATEGORY(Outline,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(Outline,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Outline,"$Id: outline.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -174,7 +174,7 @@ Outline::sync() #if 1 const bool loop(bline.get_loop()); - const vector bline_(bline.get_list().begin(),bline.get_list().end()); + const vector bline_(bline.get_list().begin(),bline.get_list().end()); #define bline bline_ vector::const_iterator @@ -388,7 +388,7 @@ Outline::sync() if(segment_list.empty()) { - sinfg::warning("Outline: segment_list is empty, layer disabled"); + synfig::warning("Outline: segment_list is empty, layer disabled"); clear(); return; } @@ -618,9 +618,9 @@ Outline::sync() for(iter=vector_list.begin();iter!=vector_list.end();++iter) if(!iter->is_valid()) { - sinfg::error("Outline::sync(): Bad point in vector_list!"); + synfig::error("Outline::sync(): Bad point in vector_list!"); } - //sinfg::info("BLEHH__________--- x:%f, y:%f",vector_list.front()[0],vector_list.front()[1]); + //synfig::info("BLEHH__________--- x:%f, y:%f",vector_list.front()[0],vector_list.front()[1]); } #endif @@ -628,7 +628,7 @@ Outline::sync() #endif - } catch (...) { sinfg::error("Outline::sync(): Exception thrown"); throw; } + } catch (...) { synfig::error("Outline::sync(): Exception thrown"); throw; } } #undef bline @@ -642,10 +642,10 @@ Outline::set_param(const String & param, const ValueBase &value) { connect_dynamic_param("bline",dynamic_param_list().find("segment_list")->second); disconnect_dynamic_param("segment_list"); - sinfg::warning("Outline::set_param(): Updated valuenode connection to use the new \"bline\" parameter."); + synfig::warning("Outline::set_param(): Updated valuenode connection to use the new \"bline\" parameter."); } else - sinfg::warning("Outline::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead."); + synfig::warning("Outline::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead."); } if( (param=="segment_list" || param=="bline") && value.get_type()==ValueBase::TYPE_LIST) diff --git a/synfig-core/trunk/src/modules/mod_geometry/outline.h b/synfig-core/trunk/src/modules/mod_geometry/outline.h index 1e5acde..e8098ab 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/outline.h +++ b/synfig-core/trunk/src/modules/mod_geometry/outline.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file bline.h ** \brief Template Header ** @@ -21,16 +21,16 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_OUTLINE_H -#define __SINFG_OUTLINE_H +#ifndef __SYNFIG_OUTLINE_H +#define __SYNFIG_OUTLINE_H /* === H E A D E R S ======================================================= */ #include #include -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -38,19 +38,19 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Outline : public sinfg::Layer_Polygon +class Outline : public synfig::Layer_Polygon { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::ValueBase bline; + synfig::ValueBase bline; - std::vector segment_list; - std::vector width_list; + std::vector segment_list; + std::vector width_list; bool round_tip[2]; @@ -58,9 +58,9 @@ private: bool loop_; - sinfg::Real width; + synfig::Real width; - sinfg::Real expand; + synfig::Real expand; Real loopyness; bool old_version; @@ -76,7 +76,7 @@ public: //! Updates the polygon data to match the parameters. void sync(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; diff --git a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp index 326b44e..8c48033 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file rectangle.cpp ** \point2ief Template Header ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -47,16 +47,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Rectangle); -SINFG_LAYER_SET_NAME(Rectangle,"rectangle"); -SINFG_LAYER_SET_LOCAL_NAME(Rectangle,_("Rectangle")); -SINFG_LAYER_SET_CATEGORY(Rectangle,_("Geometry")); -SINFG_LAYER_SET_VERSION(Rectangle,"0.2"); -SINFG_LAYER_SET_CVS_ID(Rectangle,"$Id: rectangle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_INIT(Rectangle); +SYNFIG_LAYER_SET_NAME(Rectangle,"rectangle"); +SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,_("Rectangle")); +SYNFIG_LAYER_SET_CATEGORY(Rectangle,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(Rectangle,"0.2"); +SYNFIG_LAYER_SET_CVS_ID(Rectangle,"$Id: rectangle.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -139,8 +139,8 @@ Rectangle::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Rectangle::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Rectangle::hit_check(synfig::Context context, const synfig::Point &pos)const { if(is_disabled()) return context.hit_check(pos); @@ -165,7 +165,7 @@ Rectangle::hit_check(sinfg::Context context, const sinfg::Point &pos)const if(intersect) { - sinfg::Layer::Handle tmp; + synfig::Layer::Handle tmp; if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(pos))) return tmp; if(Color::is_onto(get_blend_method()) && !(tmp=context.hit_check(pos))) diff --git a/synfig-core/trunk/src/modules/mod_geometry/rectangle.h b/synfig-core/trunk/src/modules/mod_geometry/rectangle.h index 977f3fb..ee79c61 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/rectangle.h +++ b/synfig-core/trunk/src/modules/mod_geometry/rectangle.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file rectangle.h ** \brief Template Header ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_FILLEDRECT_H -#define __SINFG_FILLEDRECT_H +#ifndef __SYNFIG_FILLEDRECT_H +#define __SYNFIG_FILLEDRECT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -38,18 +38,18 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Rectangle : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class Rectangle : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Color color; + synfig::Color color; - sinfg::Point point1; - sinfg::Point point2; + synfig::Point point1; + synfig::Point point2; - sinfg::Real expand; + synfig::Real expand; bool invert; @@ -57,18 +57,18 @@ public: Rectangle(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; - virtual sinfg::Rect get_bounding_rect()const; - virtual sinfg::Rect get_full_bounding_rect(sinfg::Context context)const; + virtual synfig::Rect get_bounding_rect()const; + virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const; virtual Vocab get_param_vocab()const; }; // END of class FilledRect diff --git a/synfig-core/trunk/src/modules/mod_geometry/region.cpp b/synfig-core/trunk/src/modules/mod_geometry/region.cpp index deb7b66..2bdc82e 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/region.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/region.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -32,16 +32,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -53,12 +53,12 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Region); -SINFG_LAYER_SET_NAME(Region,"region"); -SINFG_LAYER_SET_LOCAL_NAME(Region,_("Region")); -SINFG_LAYER_SET_CATEGORY(Region,_("Geometry")); -SINFG_LAYER_SET_VERSION(Region,"0.1"); -SINFG_LAYER_SET_CVS_ID(Region,"$Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Region); +SYNFIG_LAYER_SET_NAME(Region,"region"); +SYNFIG_LAYER_SET_LOCAL_NAME(Region,_("Region")); +SYNFIG_LAYER_SET_CATEGORY(Region,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(Region,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Region,"$Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -94,14 +94,14 @@ Region::sync() } else { - sinfg::warning("Region: incorrect type on bline, layer disabled"); + synfig::warning("Region: incorrect type on bline, layer disabled"); clear(); return; } if(segment_list.empty()) { - sinfg::warning("Region: segment_list is empty, layer disabled"); + synfig::warning("Region: segment_list is empty, layer disabled"); clear(); return; } @@ -175,10 +175,10 @@ Region::set_param(const String & param, const ValueBase &value) { connect_dynamic_param("bline",dynamic_param_list().find("segment_list")->second); disconnect_dynamic_param("segment_list"); - sinfg::warning("Region::set_param(): Updated valuenode connection to use the new \"bline\" parameter."); + synfig::warning("Region::set_param(): Updated valuenode connection to use the new \"bline\" parameter."); } else - sinfg::warning("Region::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead."); + synfig::warning("Region::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead."); } if( (param=="segment_list" || param=="bline") && value.get_type()==ValueBase::TYPE_LIST) diff --git a/synfig-core/trunk/src/modules/mod_geometry/region.h b/synfig-core/trunk/src/modules/mod_geometry/region.h index 011e23a..27ae537 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/region.h +++ b/synfig-core/trunk/src/modules/mod_geometry/region.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: region.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_REGION_H -#define __SINFG_REGION_H +#ifndef __SYNFIG_REGION_H +#define __SYNFIG_REGION_H /* === H E A D E R S ======================================================= */ -#include +#include #include #include -#include +#include /* === M A C R O S ========================================================= */ @@ -36,25 +36,25 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { class Segment; } +namespace synfig { class Segment; } -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Region : protected sinfg::Layer_Polygon//Shape +class Region : protected synfig::Layer_Polygon//Shape { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::ValueBase bline; - std::vector segment_list; + synfig::ValueBase bline; + std::vector segment_list; public: Region(); //! Updates the polygon data to match the parameters. void sync(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; diff --git a/synfig-core/trunk/src/modules/mod_geometry/star.cpp b/synfig-core/trunk/src/modules/mod_geometry/star.cpp index 2e5bac0..f9d571a 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/star.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/star.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: star.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -32,15 +32,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -52,12 +52,12 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Star); -SINFG_LAYER_SET_NAME(Star,"star"); -SINFG_LAYER_SET_LOCAL_NAME(Star,_("Star")); -SINFG_LAYER_SET_CATEGORY(Star,_("Geometry")); -SINFG_LAYER_SET_VERSION(Star,"0.1"); -SINFG_LAYER_SET_CVS_ID(Star,"$Id: star.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(Star); +SYNFIG_LAYER_SET_NAME(Star,"star"); +SYNFIG_LAYER_SET_LOCAL_NAME(Star,_("Star")); +SYNFIG_LAYER_SET_CATEGORY(Star,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(Star,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Star,"$Id: star.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-core/trunk/src/modules/mod_geometry/star.h b/synfig-core/trunk/src/modules/mod_geometry/star.h index 85c4b20..6481b93 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/star.h +++ b/synfig-core/trunk/src/modules/mod_geometry/star.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: star.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,12 +20,12 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STAR_H -#define __SINFG_STAR_H +#ifndef __SYNFIG_STAR_H +#define __SYNFIG_STAR_H /* === H E A D E R S ======================================================= */ -#include +#include #include #include @@ -35,13 +35,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Star : protected sinfg::Layer_Polygon +class Star : protected synfig::Layer_Polygon { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: Real radius1; @@ -54,7 +54,7 @@ public: //! Updates the polygon data to match the parameters. void sync(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; diff --git a/synfig-core/trunk/src/modules/mod_gif/Makefile.am b/synfig-core/trunk/src/modules/mod_gif/Makefile.am index 5a2aa81..0840596 100644 --- a/synfig-core/trunk/src/modules/mod_gif/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_gif/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_gif/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_gif/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -9,5 +9,5 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_gif.la libmod_gif_la_SOURCES = main.cpp trgt_gif.cpp trgt_gif.h libmod_gif_la_LDFLAGS = -module -no-undefined -libmod_gif_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_gif_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_gif_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_gif_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ diff --git a/synfig-core/trunk/src/modules/mod_gif/main.cpp b/synfig-core/trunk/src/modules/mod_gif/main.cpp index cd4a21f..8443398 100644 --- a/synfig-core/trunk/src/modules/mod_gif/main.cpp +++ b/synfig-core/trunk/src/modules/mod_gif/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "trgt_gif.h" #endif @@ -41,7 +41,7 @@ MODULE_DESC_BEGIN(mod_gif) MODULE_DESCRIPTION("Target for the GIF image format (B/W only)") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_gif) diff --git a/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp b/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp index 3c0f13d..29a292b 100644 --- a/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp +++ b/synfig-core/trunk/src/modules/mod_gif/trgt_gif.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** BMP Target Module ** $Id: trgt_gif.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -36,7 +36,7 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -44,11 +44,11 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(gif); -SINFG_TARGET_SET_NAME(gif,"gif"); -SINFG_TARGET_SET_EXT(gif,"gif"); -SINFG_TARGET_SET_VERSION(gif,"0.1"); -SINFG_TARGET_SET_CVS_ID(gif,"$Id: trgt_gif.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_TARGET_INIT(gif); +SYNFIG_TARGET_SET_NAME(gif,"gif"); +SYNFIG_TARGET_SET_EXT(gif,"gif"); +SYNFIG_TARGET_SET_VERSION(gif,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(gif,"$Id: trgt_gif.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -99,7 +99,7 @@ gif::init() if(!file) { - sinfg::error(strprintf(_("Unable to open \"%s\" for write access!"),filename.c_str())); + synfig::error(strprintf(_("Unable to open \"%s\" for write access!"),filename.c_str())); return false; } @@ -185,7 +185,7 @@ gif::output_curr_palette() } bool -gif::start_frame(sinfg::ProgressCallback *callback) +gif::start_frame(synfig::ProgressCallback *callback) { // int // w=desc.get_w(), @@ -238,7 +238,7 @@ gif::end_frame() if(local_palette) { curr_palette=Palette(curr_surface,256/(1<<(8-rootsize))-build_off_previous-1); - sinfg::info("curr_palette.size()=%d",curr_palette.size()); + synfig::info("curr_palette.size()=%d",curr_palette.size()); } int transparent_index(curr_palette.find_closest(Color(1,0,1,0))-curr_palette.begin()); @@ -436,7 +436,7 @@ gif::end_frame() imagecount++; } -sinfg::Color* +synfig::Color* gif::start_scanline(int scanline) { cur_scanline=scanline; diff --git a/synfig-core/trunk/src/modules/mod_gif/trgt_gif.h b/synfig-core/trunk/src/modules/mod_gif/trgt_gif.h index 381baed..42444ba 100644 --- a/synfig-core/trunk/src/modules/mod_gif/trgt_gif.h +++ b/synfig-core/trunk/src/modules/mod_gif/trgt_gif.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_gif.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,17 +20,17 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_GIF_H -#define __SINFG_TRGT_GIF_H +#ifndef __SYNFIG_TRGT_GIF_H +#define __SYNFIG_TRGT_GIF_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include /* === M A C R O S ========================================================= */ @@ -38,19 +38,19 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class gif : public sinfg::Target_Scanline +class gif : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: // Class for abstracting the // output of the codes struct bitstream { - sinfg::SmartFILE file; + synfig::SmartFILE file; unsigned char pool; char curr_bit; bitstream():pool(0),curr_bit(0),curr_pos(0) {} - bitstream(sinfg::SmartFILE file):file(file),pool(0),curr_bit(0),curr_pos(0) {} + bitstream(synfig::SmartFILE file):file(file),pool(0),curr_bit(0),curr_pos(0) {} unsigned char buffer[256]; int curr_pos; @@ -159,8 +159,8 @@ private: private: bitstream bs; - sinfg::String filename; - sinfg::SmartFILE file; + synfig::String filename; + synfig::SmartFILE file; int i, // General-purpose index codesize, // Current code size @@ -168,7 +168,7 @@ private: nextcode; // Next code to use lzwcode *table,*next,*node; - sinfg::Surface curr_surface; + synfig::Surface curr_surface; etl::surface curr_frame; etl::surface prev_frame; @@ -185,21 +185,21 @@ private: int loop_count; bool local_palette; - sinfg::Palette curr_palette; + synfig::Palette curr_palette; void output_curr_palette(); public: gif(const char *filename); - virtual bool set_rend_desc(sinfg::RendDesc *desc); + virtual bool set_rend_desc(synfig::RendDesc *desc); virtual bool init(); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); virtual ~gif(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(void); }; diff --git a/synfig-core/trunk/src/modules/mod_gradient/Makefile.am b/synfig-core/trunk/src/modules/mod_gradient/Makefile.am index 189b8b1..a56de93 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_gradient/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_gradient/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_gradient/Makefile.am,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -8,6 +8,6 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_gradient.la libmod_gradient_la_SOURCES = curvegradient.cpp curvegradient.h lineargradient.cpp lineargradient.h conicalgradient.cpp conicalgradient.h spiralgradient.cpp spiralgradient.h radialgradient.cpp radialgradient.h main.cpp -libmod_gradient_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_gradient_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_gradient_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_gradient_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ libmod_gradient_la_LDFLAGS = -module -no-undefined diff --git a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp index bd88dc4..7a6ba1c 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file conicalgradient.cpp ** \brief Template Header ** @@ -28,15 +28,15 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "conicalgradient.h" @@ -46,16 +46,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(ConicalGradient); -SINFG_LAYER_SET_NAME(ConicalGradient,"conical_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(ConicalGradient,_("Conical Gradient")); -SINFG_LAYER_SET_CATEGORY(ConicalGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(ConicalGradient,"0.1"); -SINFG_LAYER_SET_CVS_ID(ConicalGradient,"$Id: conicalgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(ConicalGradient); +SYNFIG_LAYER_SET_NAME(ConicalGradient,"conical_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(ConicalGradient,_("Conical Gradient")); +SYNFIG_LAYER_SET_CATEGORY(ConicalGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(ConicalGradient,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(ConicalGradient,"$Id: conicalgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -182,7 +182,7 @@ ConicalGradient::color_func(const Point &pos, float supersample)const } float -ConicalGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +ConicalGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const { Point adj(x-center); if(abs(adj[0])=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.h b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.h index a0b13b1..6ca75cd 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.h +++ b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file conicalgradient.h ** \brief Template Header ** @@ -21,17 +21,17 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CONICALGRADIENT_H -#define __SINFG_CONICALGRADIENT_H +#ifndef __SYNFIG_CONICALGRADIENT_H +#define __SYNFIG_CONICALGRADIENT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -39,36 +39,36 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class ConicalGradient : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class ConicalGradient : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Gradient gradient; + synfig::Gradient gradient; - sinfg::Point center; + synfig::Point center; - sinfg::Angle angle; + synfig::Angle angle; bool symmetric; - sinfg::Color color_func(const sinfg::Point &x, float supersample=0)const; + synfig::Color color_func(const synfig::Point &x, float supersample=0)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; public: ConicalGradient(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; // END of class ConicalGradient diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp index a373041..9f28114 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: curvegradient.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $ ** @@ -29,14 +29,14 @@ #include "curvegradient.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -47,16 +47,16 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(CurveGradient); -SINFG_LAYER_SET_NAME(CurveGradient,"curve_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(CurveGradient,_("Curve Gradient")); -SINFG_LAYER_SET_CATEGORY(CurveGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(CurveGradient,"0.0"); -SINFG_LAYER_SET_CVS_ID(CurveGradient,"$Id: curvegradient.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $"); +SYNFIG_LAYER_INIT(CurveGradient); +SYNFIG_LAYER_SET_NAME(CurveGradient,"curve_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(CurveGradient,_("Curve Gradient")); +SYNFIG_LAYER_SET_CATEGORY(CurveGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(CurveGradient,"0.0"); +SYNFIG_LAYER_SET_CVS_ID(CurveGradient,"$Id: curvegradient.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $"); /* === P R O C E D U R E S ================================================= */ -inline float calculate_distance(const sinfg::BLinePoint& a,const sinfg::BLinePoint& b) +inline float calculate_distance(const synfig::BLinePoint& a,const synfig::BLinePoint& b) { #if 1 const Point& c1(a.get_vertex()); @@ -68,10 +68,10 @@ inline float calculate_distance(const sinfg::BLinePoint& a,const sinfg::BLinePoi #endif } -inline float calculate_distance(const std::vector& bline) +inline float calculate_distance(const std::vector& bline) { - std::vector::const_iterator iter,next,ret; - std::vector::const_iterator end(bline.end()); + std::vector::const_iterator iter,next,ret; + std::vector::const_iterator end(bline.end()); float dist(0); @@ -99,11 +99,11 @@ inline float calculate_distance(const std::vector& bline) return dist; } -std::vector::const_iterator -find_closest(const std::vector& bline,const Point& p,bool loop=false,float *bline_dist_ret=0) +std::vector::const_iterator +find_closest(const std::vector& bline,const Point& p,bool loop=false,float *bline_dist_ret=0) { - std::vector::const_iterator iter,next,ret; - std::vector::const_iterator end(bline.end()); + std::vector::const_iterator iter,next,ret; + std::vector::const_iterator end(bline.end()); ret=bline.end(); float dist(100000000000.0); @@ -230,7 +230,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co { Point point(point_-offset); - std::vector::const_iterator iter,next; + std::vector::const_iterator iter,next; // Figure out the BLinePoints we will be using, // Taking into account looping. @@ -358,14 +358,14 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co } float -CurveGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +CurveGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const { // return pw/(p2-p1).mag(); return pw; } -sinfg::Layer::Handle -CurveGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +CurveGradient::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h index 4ab219d..d0ebf66 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h +++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: curvegradient.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CURVEGRADIENT_H -#define __SINFG_CURVEGRADIENT_H +#ifndef __SYNFIG_CURVEGRADIENT_H +#define __SYNFIG_CURVEGRADIENT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -36,16 +36,16 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class CurveGradient : public Layer_Composite, public Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - std::vector bline; + std::vector bline; Point p1,p2; Point offset; @@ -61,9 +61,9 @@ private: void sync(); - sinfg::Color color_func(const sinfg::Point &x, int quality=10, float supersample=0)const; + synfig::Color color_func(const synfig::Point &x, int quality=10, float supersample=0)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; public: CurveGradient(); @@ -72,7 +72,7 @@ public: virtual ValueBase get_param(const String ¶m)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp index 54cf301..f067666 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: lineargradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -29,14 +29,14 @@ #include "lineargradient.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif @@ -44,12 +44,12 @@ /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(LinearGradient); -SINFG_LAYER_SET_NAME(LinearGradient,"linear_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(LinearGradient,_("Linear Gradient")); -SINFG_LAYER_SET_CATEGORY(LinearGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(LinearGradient,"0.0"); -SINFG_LAYER_SET_CVS_ID(LinearGradient,"$Id: lineargradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(LinearGradient); +SYNFIG_LAYER_SET_NAME(LinearGradient,"linear_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(LinearGradient,_("Linear Gradient")); +SYNFIG_LAYER_SET_CATEGORY(LinearGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(LinearGradient,"0.0"); +SYNFIG_LAYER_SET_CVS_ID(LinearGradient,"$Id: lineargradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -108,13 +108,13 @@ LinearGradient::color_func(const Point &point, float supersample)const } float -LinearGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +LinearGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const { return pw/(p2-p1).mag(); } -sinfg::Layer::Handle -LinearGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +LinearGradient::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.h b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.h index 8216bd0..932eca2 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.h +++ b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: lineargradient.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_INTERPOLATION_LINEARGRADIENT_H -#define __SINFG_INTERPOLATION_LINEARGRADIENT_H +#ifndef __SYNFIG_INTERPOLATION_LINEARGRADIENT_H +#define __SYNFIG_INTERPOLATION_LINEARGRADIENT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -35,13 +35,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; class LinearGradient : public Layer_Composite, public Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: @@ -54,9 +54,9 @@ private: void sync(); - sinfg::Color color_func(const sinfg::Point &x, float supersample=0)const; + synfig::Color color_func(const synfig::Point &x, float supersample=0)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; public: LinearGradient(); @@ -65,7 +65,7 @@ public: virtual ValueBase get_param(const String ¶m)const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/mod_gradient/main.cpp b/synfig-core/trunk/src/modules/mod_gradient/main.cpp index 949b7f4..e71ad84 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/main.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,9 +29,9 @@ # include #endif -#include -#include -#include +#include +#include +#include #include "lineargradient.h" #include "radialgradient.h" @@ -48,7 +48,7 @@ MODULE_DESC_BEGIN(libmod_gradient) MODULE_DESCRIPTION("Writeme") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(libmod_gradient) diff --git a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp index e4d26dd..a4451cd 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_solidcolor.cpp ** \brief Template Header ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "radialgradient.h" @@ -45,16 +45,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(RadialGradient); -SINFG_LAYER_SET_NAME(RadialGradient,"radial_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient")); -SINFG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(RadialGradient,"0.1"); -SINFG_LAYER_SET_CVS_ID(RadialGradient,"$Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(RadialGradient); +SYNFIG_LAYER_SET_NAME(RadialGradient,"radial_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient")); +SYNFIG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(RadialGradient,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(RadialGradient,"$Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -165,14 +165,14 @@ RadialGradient::color_func(const Point &point, float supersample)const float -RadialGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +RadialGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const { // return sqrt(pw*pw+ph*ph)/radius; return 1.2*pw/radius; } -sinfg::Layer::Handle -RadialGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +RadialGradient::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.h b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.h index e7db506..32ad772 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.h +++ b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file radialgradient.h ** \brief Template Header ** @@ -21,16 +21,16 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_RADIALGRADIENT_H -#define __SINFG_RADIALGRADIENT_H +#ifndef __SYNFIG_RADIALGRADIENT_H +#define __SYNFIG_RADIALGRADIENT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -38,37 +38,37 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class RadialGradient : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class RadialGradient : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Gradient gradient; + synfig::Gradient gradient; - sinfg::Point center; + synfig::Point center; - sinfg::Real radius; + synfig::Real radius; bool loop; bool zigzag; - sinfg::Color color_func(const sinfg::Point &x, float supersample=0)const; + synfig::Color color_func(const synfig::Point &x, float supersample=0)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; public: RadialGradient(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; // END of class RadialGradient diff --git a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp index 8386c25..c4330a8 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file spiralgradient.cpp ** \brief Template Header ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "spiralgradient.h" @@ -45,16 +45,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(SpiralGradient); -SINFG_LAYER_SET_NAME(SpiralGradient,"spiral_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(SpiralGradient,_("Spiral Gradient")); -SINFG_LAYER_SET_CATEGORY(SpiralGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(SpiralGradient,"0.1"); -SINFG_LAYER_SET_CVS_ID(SpiralGradient,"$Id: spiralgradient.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_LAYER_INIT(SpiralGradient); +SYNFIG_LAYER_SET_NAME(SpiralGradient,"spiral_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(SpiralGradient,_("Spiral Gradient")); +SYNFIG_LAYER_SET_CATEGORY(SpiralGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(SpiralGradient,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(SpiralGradient,"$Id: spiralgradient.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -165,13 +165,13 @@ SpiralGradient::color_func(const Point &pos, float supersample)const } float -SpiralGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +SpiralGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const { return (1.41421*pw/radius+(1.41421*pw/Point(x-center).mag())/(PI*2))*0.5; } -sinfg::Layer::Handle -SpiralGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +SpiralGradient::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.h b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.h index b4d2a20..ad1f714 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.h +++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file spiralgradient.h ** \brief Template Header ** @@ -21,17 +21,17 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SPIRALGRADIENT_H -#define __SINFG_SPIRALGRADIENT_H +#ifndef __SYNFIG_SPIRALGRADIENT_H +#define __SYNFIG_SPIRALGRADIENT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* === M A C R O S ========================================================= */ @@ -39,38 +39,38 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class SpiralGradient : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class SpiralGradient : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Gradient gradient; + synfig::Gradient gradient; - sinfg::Point center; + synfig::Point center; - sinfg::Real radius; + synfig::Real radius; - sinfg::Angle angle; + synfig::Angle angle; bool clockwise; - sinfg::Color color_func(const sinfg::Point &x, float supersample=0)const; + synfig::Color color_func(const synfig::Point &x, float supersample=0)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; public: SpiralGradient(); - virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value); + virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String & param)const; + virtual synfig::ValueBase get_param(const synfig::String & param)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; // END of class SpiralGradient diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am b/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am index 688aec4..4a02776 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_imagemagick/Makefile.am,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_imagemagick/Makefile.am,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -10,8 +10,8 @@ if WITH_IMAGEMAGICK module_LTLIBRARIES = libmod_imagemagick.la libmod_imagemagick_la_SOURCES = main.cpp mptr_imagemagick.cpp mptr_imagemagick.h trgt_imagemagick.cpp trgt_imagemagick.h libmod_imagemagick_la_LDFLAGS = -module -no-undefined -libmod_imagemagick_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_imagemagick_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_imagemagick_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_imagemagick_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ else endif diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/main.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/main.cpp index 0378ae1..34c112b 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/main.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "mptr_imagemagick.h" #include "trgt_imagemagick.h" #endif @@ -41,7 +41,7 @@ MODULE_DESC_BEGIN(mod_imagemagick) MODULE_DESCRIPTION("Provides targets and importers for nearly every format that ImageMagick supports") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_imagemagick) diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp index 22161ed..261140f 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: mptr_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -33,23 +33,23 @@ #include #include #include -#include +#include #endif /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(imagemagick_mptr); -SINFG_IMPORTER_SET_NAME(imagemagick_mptr,"imagemagick"); -SINFG_IMPORTER_SET_EXT(imagemagick_mptr,"miff"); -SINFG_IMPORTER_SET_VERSION(imagemagick_mptr,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(imagemagick_mptr,"$Id: mptr_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_IMPORTER_INIT(imagemagick_mptr); +SYNFIG_IMPORTER_SET_NAME(imagemagick_mptr,"imagemagick"); +SYNFIG_IMPORTER_SET_EXT(imagemagick_mptr,"miff"); +SYNFIG_IMPORTER_SET_VERSION(imagemagick_mptr,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(imagemagick_mptr,"$Id: mptr_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -68,7 +68,7 @@ imagemagick_mptr::~imagemagick_mptr() } bool -imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCallback *cb) +imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *cb) { //#define HAS_LIBPNG 1 @@ -81,7 +81,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(filename.empty()) { if(cb)cb->error(_("No file to load")); - else sinfg::error(_("No file to load")); + else synfig::error(_("No file to load")); return false; } string temp_file="/tmp/deleteme.png"; @@ -91,7 +91,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa else command=strprintf("convert \"%s\" \"png32:%s\"\n",filename.c_str(),temp_file.c_str()); - sinfg::info("command=%s",command.c_str()); + synfig::info("command=%s",command.c_str()); if(system(command.c_str())!=0) return false; @@ -103,7 +103,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(!importer) { if(cb)cb->error(_("Unable to open ")+temp_file); - else sinfg::error(_("Unable to open ")+temp_file); + else synfig::error(_("Unable to open ")+temp_file); return false; } @@ -112,14 +112,14 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(!importer->get_frame(surface,0,cb)) { if(cb)cb->error(_("Unable to get frame from ")+temp_file); - else sinfg::error(_("Unable to get frame from ")+temp_file); + else synfig::error(_("Unable to get frame from ")+temp_file); return false; } if(!surface) { if(cb)cb->error(_("Bad surface from ")+temp_file); - else sinfg::error(_("Bad surface from ")+temp_file); + else synfig::error(_("Bad surface from ")+temp_file); return false; } @@ -163,7 +163,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(filename.empty()) { if(cb)cb->error(_("No file to load")); - else sinfg::error(_("No file to load")); + else synfig::error(_("No file to load")); return false; } @@ -174,7 +174,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(!file) { if(cb)cb->error(_("Unable to open pipe to imagemagick")); - else sinfg::error(_("Unable to open pipe to imagemagick")); + else synfig::error(_("Unable to open pipe to imagemagick")); return false; } int w,h; @@ -186,7 +186,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(feof(file)) { if(cb)cb->error(_("Reached end of stream without finding PPM header")); - else sinfg::error(_("Reached end of stream without finding PPM header")); + else synfig::error(_("Reached end of stream without finding PPM header")); return false; } @@ -195,7 +195,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(cookie[0]!='P' || cookie[1]!='6') { if(cb)cb->error(string(_("stream not in PPM format"))+" \""+cookie[0]+cookie[1]+'"'); - else sinfg::error(string(_("stream not in PPM format"))+" \""+cookie[0]+cookie[1]+'"'); + else synfig::error(string(_("stream not in PPM format"))+" \""+cookie[0]+cookie[1]+'"'); return false; } @@ -207,7 +207,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(feof(file)) { if(cb)cb->error(_("Premature end of file (after header)")); - else sinfg::error(_("Premature end of file (after header)")); + else synfig::error(_("Premature end of file (after header)")); return false; } @@ -220,7 +220,7 @@ imagemagick_mptr::get_frame(sinfg::Surface &surface,Time time, sinfg::ProgressCa if(feof(file)) { if(cb)cb->error(_("Premature end of file")); - else sinfg::error(_("Premature end of file")); + else synfig::error(_("Premature end of file")); return false; } float b=gamma().r_U8_to_F32((unsigned char)fgetc(file)); diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h index 08f1a74..d813c16 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h +++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: mptr_imagemagick.h,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MPTR_IMAGEMAGICK_H -#define __SINFG_MPTR_IMAGEMAGICK_H +#ifndef __SYNFIG_MPTR_IMAGEMAGICK_H +#define __SYNFIG_MPTR_IMAGEMAGICK_H /* === H E A D E R S ======================================================= */ -#include +#include #include #include "string.h" -#include +#include /* === M A C R O S ========================================================= */ @@ -36,21 +36,21 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class imagemagick_mptr : public sinfg::Importer +class imagemagick_mptr : public synfig::Importer { - SINFG_IMPORTER_MODULE_EXT + SYNFIG_IMPORTER_MODULE_EXT private: - sinfg::String filename; + synfig::String filename; FILE *file; int cur_frame; - sinfg::Surface frame; + synfig::Surface frame; public: imagemagick_mptr(const char *filename); ~imagemagick_mptr(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp index 08ba544..54f7d3c 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: trgt_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -41,17 +41,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(imagemagick_trgt); -SINFG_TARGET_SET_NAME(imagemagick_trgt,"imagemagick"); -SINFG_TARGET_SET_EXT(imagemagick_trgt,"miff"); -SINFG_TARGET_SET_VERSION(imagemagick_trgt,"0.1"); -SINFG_TARGET_SET_CVS_ID(imagemagick_trgt,"$Id: trgt_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_TARGET_INIT(imagemagick_trgt); +SYNFIG_TARGET_SET_NAME(imagemagick_trgt,"imagemagick"); +SYNFIG_TARGET_SET_EXT(imagemagick_trgt,"miff"); +SYNFIG_TARGET_SET_VERSION(imagemagick_trgt,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(imagemagick_trgt,"$Id: trgt_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -113,7 +113,7 @@ imagemagick_trgt::end_frame() } bool -imagemagick_trgt::start_frame(sinfg::ProgressCallback *cb) +imagemagick_trgt::start_frame(synfig::ProgressCallback *cb) { string command; @@ -128,7 +128,7 @@ imagemagick_trgt::start_frame(sinfg::ProgressCallback *cb) { const char *msg=_("Unable to open pipe to imagemagick's convert utility"); if(cb)cb->error(N_(msg)); - else sinfg::error(N_(msg)); + else synfig::error(N_(msg)); return false; } diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.h b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.h index 946b997..bd6ca4e 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.h +++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_imagemagick.h,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,13 +20,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_IMAGEMAGICK_H -#define __SINFG_TRGT_IMAGEMAGICK_H +#ifndef __SYNFIG_TRGT_IMAGEMAGICK_H +#define __SYNFIG_TRGT_IMAGEMAGICK_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -36,26 +36,26 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class imagemagick_trgt : public sinfg::Target_Scanline +class imagemagick_trgt : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: int imagecount; bool multi_image; FILE *file; - sinfg::String filename; + synfig::String filename; unsigned char *buffer; - sinfg::Color *color_buffer; - sinfg::PixelFormat pf; + synfig::Color *color_buffer; + synfig::PixelFormat pf; public: imagemagick_trgt(const char *filename); virtual ~imagemagick_trgt(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); + virtual bool set_rend_desc(synfig::RendDesc *desc); virtual bool init(); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am b/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am index a01441f..f23a549 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_jpeg/Makefile.am,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_jpeg/Makefile.am,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -10,7 +10,7 @@ if HAVE_LIBJPEG module_LTLIBRARIES = libmod_jpeg.la libmod_jpeg_la_SOURCES = main.cpp trgt_jpeg.cpp trgt_jpeg.h mptr_jpeg.cpp mptr_jpeg.h libmod_jpeg_la_LDFLAGS = -module @JPEG_LIBS@ -no-undefined -libmod_jpeg_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_jpeg_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_jpeg_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_jpeg_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ else endif diff --git a/synfig-core/trunk/src/modules/mod_jpeg/main.cpp b/synfig-core/trunk/src/modules/mod_jpeg/main.cpp index aa8f514..c071899 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/main.cpp +++ b/synfig-core/trunk/src/modules/mod_jpeg/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "trgt_jpeg.h" #include "mptr_jpeg.h" #endif @@ -41,7 +41,7 @@ MODULE_DESC_BEGIN(mod_jpeg) MODULE_DESCRIPTION("Provides a JPEG target and importer") MODULE_AUTHOR("Robert B. Quattlebaum Jr") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_jpeg) diff --git a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp index 651ffee..076aa40 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: mptr_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -34,9 +34,9 @@ #endif #include "mptr_jpeg.h" -#include -#include -#include +#include +#include +#include #include @@ -46,7 +46,7 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -54,11 +54,11 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(jpeg_mptr); -SINFG_IMPORTER_SET_NAME(jpeg_mptr,"jpeg_mptr"); -SINFG_IMPORTER_SET_EXT(jpeg_mptr,"jpg"); -SINFG_IMPORTER_SET_VERSION(jpeg_mptr,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(jpeg_mptr,"$Id: mptr_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_IMPORTER_INIT(jpeg_mptr); +SYNFIG_IMPORTER_SET_NAME(jpeg_mptr,"jpeg_mptr"); +SYNFIG_IMPORTER_SET_EXT(jpeg_mptr,"jpg"); +SYNFIG_IMPORTER_SET_VERSION(jpeg_mptr,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(jpeg_mptr,"$Id: mptr_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -157,7 +157,7 @@ jpeg_mptr::jpeg_mptr(const char *file_name) if(!buffer) { - sinfg::error("jpeg_mptr: error: alloc of \"buffer\" failed (bug?)"); + synfig::error("jpeg_mptr: error: alloc of \"buffer\" failed (bug?)"); throw String("alloc of \"buffer\" failed (bug?)"); } @@ -214,7 +214,7 @@ jpeg_mptr::jpeg_mptr(const char *file_name) break; default: - sinfg::error("jpeg_mptr: error: Unsupported color type"); + synfig::error("jpeg_mptr: error: Unsupported color type"); //! \todo THROW SOMETHING throw String("error on importer construction, *WRITEME*6"); return; @@ -245,7 +245,7 @@ jpeg_mptr::~jpeg_mptr() } bool -jpeg_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) +jpeg_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) { surface.mirror(surface_buffer); return true; diff --git a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h index 871b73e..2b62937 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h +++ b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: mptr_jpeg.h,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,15 +20,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MPTR_JPEG_H -#define __SINFG_MPTR_JPEG_H +#ifndef __SYNFIG_MPTR_JPEG_H +#define __SYNFIG_MPTR_JPEG_H /* === H E A D E R S ======================================================= */ #define NOMINMAX -#include -#include -#include +#include +#include +#include _ETL_BEGIN_CDECLS #include _ETL_END_CDECLS @@ -40,12 +40,12 @@ _ETL_END_CDECLS /* === C L A S S E S & S T R U C T S ======================================= */ -class jpeg_mptr : public sinfg::Importer +class jpeg_mptr : public synfig::Importer { - SINFG_IMPORTER_MODULE_EXT + SYNFIG_IMPORTER_MODULE_EXT private: - sinfg::String filename; - sinfg::Surface surface_buffer; + synfig::String filename; + synfig::Surface surface_buffer; struct jpeg_decompress_struct cinfo; @@ -55,7 +55,7 @@ public: jpeg_mptr(const char *filename); ~jpeg_mptr(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp index 4ea38a3..d3fffa4 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** jpeg_trgt Target Module ** $Id: trgt_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -39,17 +39,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(jpeg_trgt); -SINFG_TARGET_SET_NAME(jpeg_trgt,"jpeg"); -SINFG_TARGET_SET_EXT(jpeg_trgt,"jpg"); -SINFG_TARGET_SET_VERSION(jpeg_trgt,"0.1"); -SINFG_TARGET_SET_CVS_ID(jpeg_trgt,"$Id: trgt_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_TARGET_INIT(jpeg_trgt); +SYNFIG_TARGET_SET_NAME(jpeg_trgt,"jpeg"); +SYNFIG_TARGET_SET_EXT(jpeg_trgt,"jpg"); +SYNFIG_TARGET_SET_VERSION(jpeg_trgt,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(jpeg_trgt,"$Id: trgt_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -92,7 +92,7 @@ jpeg_trgt::set_rend_desc(RendDesc *given_desc) } bool -jpeg_trgt::start_frame(sinfg::ProgressCallback *callback) +jpeg_trgt::start_frame(synfig::ProgressCallback *callback) { int w=desc.get_w(),h=desc.get_h(); diff --git a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.h b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.h index 3b5fa58..ac4c272 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.h +++ b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_jpeg.h,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_JPEG_H -#define __SINFG_TRGT_JPEG_H +#ifndef __SYNFIG_TRGT_JPEG_H +#define __SYNFIG_TRGT_JPEG_H /* === H E A D E R S ======================================================= */ #define NOMINMAX -#include -#include +#include +#include #include _ETL_BEGIN_CDECLS #include @@ -40,9 +40,9 @@ _ETL_END_CDECLS /* === C L A S S E S & S T R U C T S ======================================= */ -class jpeg_trgt : public sinfg::Target_Scanline +class jpeg_trgt : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: FILE *file; int w,h,quality; @@ -52,18 +52,18 @@ private: bool multi_image,ready; int imagecount; - sinfg::String filename; + synfig::String filename; unsigned char *buffer; - sinfg::Color *color_buffer; + synfig::Color *color_buffer; public: jpeg_trgt(const char *filename); virtual ~jpeg_trgt(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am index a04a752..f97f394 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_libavcodec/Makefile.am,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_libavcodec/Makefile.am,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -13,7 +13,7 @@ module_LTLIBRARIES = libmod_libavcodec.la libmod_libavcodec_la_SOURCES = main.cpp trgt_av.cpp trgt_av.h mptr.cpp mptr.h libmod_libavcodec_la_LDFLAGS = -module -no-undefined -lavcodec -lavformat -libmod_libavcodec_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_libavcodec_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_libavcodec_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_libavcodec_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ else endif diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/main.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/main.cpp index 52f3e13..3d54af4 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/main.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/main.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file main.cpp ** \brief writeme ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -30,8 +30,8 @@ # include #endif -#include -#include +#include +#include //#include "mptr.h" #include "trgt_av.h" @@ -45,7 +45,7 @@ MODULE_DESC_BEGIN(mod_libavcodec) MODULE_DESCRIPTION("Provides import/export ability for AVI, MPG, ASF, and a variety of other formats.") MODULE_AUTHOR("Adrian Bentley") MODULE_VERSION("0.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_libavcodec) diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp index a136369..0e428db 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file mptr.cpp ** \brief writeme ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -31,8 +31,8 @@ #endif #include "mptr.h" -#include -#include +#include +#include #include #include @@ -40,17 +40,17 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(Importer_LibAVCodec); -SINFG_IMPORTER_SET_NAME(Importer_LibAVCodec,"Importer_LibAVCodec"); -SINFG_IMPORTER_SET_EXT(Importer_LibAVCodec,"avi"); -SINFG_IMPORTER_SET_VERSION(Importer_LibAVCodec,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(Importer_LibAVCodec,"$Id: mptr.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_IMPORTER_INIT(Importer_LibAVCodec); +SYNFIG_IMPORTER_SET_NAME(Importer_LibAVCodec,"Importer_LibAVCodec"); +SYNFIG_IMPORTER_SET_EXT(Importer_LibAVCodec,"avi"); +SYNFIG_IMPORTER_SET_VERSION(Importer_LibAVCodec,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(Importer_LibAVCodec,"$Id: mptr.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -65,7 +65,7 @@ Importer_LibAVCodec::~Importer_LibAVCodec() } bool -Importer_LibAVCodec::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) +Importer_LibAVCodec::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) { return false; } diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h index 0c61779..9cb36bf 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h +++ b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file mptr.h ** \brief writeme ** @@ -21,14 +21,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MPTR_H -#define __SINFG_MPTR_H +#ifndef __SYNFIG_MPTR_H +#define __SYNFIG_MPTR_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -37,18 +37,18 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Importer_LibAVCodec : public sinfg::Importer +class Importer_LibAVCodec : public synfig::Importer { -SINFG_IMPORTER_MODULE_EXT +SYNFIG_IMPORTER_MODULE_EXT private: - sinfg::String filename; + synfig::String filename; public: Importer_LibAVCodec(const char *filename); ~Importer_LibAVCodec(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp index bb72d40..edd25d4 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file trgt.cpp ** \brief \writeme ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -37,7 +37,7 @@ extern "C" #include "libavformat/avformat.h" } -#include +#include #include #include @@ -50,17 +50,17 @@ extern "C" /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === I N F O ============================================================= */ -SINFG_TARGET_INIT(Target_LibAVCodec); -SINFG_TARGET_SET_NAME(Target_LibAVCodec,"libav"); -SINFG_TARGET_SET_EXT(Target_LibAVCodec,"avi"); -SINFG_TARGET_SET_VERSION(Target_LibAVCodec,"0.1"); -SINFG_TARGET_SET_CVS_ID(Target_LibAVCodec,"$Id: trgt_av.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_TARGET_INIT(Target_LibAVCodec); +SYNFIG_TARGET_SET_NAME(Target_LibAVCodec,"libav"); +SYNFIG_TARGET_SET_EXT(Target_LibAVCodec,"avi"); +SYNFIG_TARGET_SET_VERSION(Target_LibAVCodec,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(Target_LibAVCodec,"$Id: trgt_av.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === C L A S S E S & S T R U C T S ======================================= */ @@ -197,14 +197,14 @@ public: codec = avcodec_find_encoder(context->codec_id); if(!codec) { - sinfg::warning("audio-open: could not find codec"); + synfig::warning("audio-open: could not find codec"); return 0; } //open the codec if(avcodec_open(context, codec) < 0) { - sinfg::warning("audio-open: could not open codec"); + synfig::warning("audio-open: could not open codec"); return 0; } @@ -259,7 +259,7 @@ public: //write the compressed audio to a file if(av_write_frame(formatc, stream->index, &audiobuffer[0], size) != 0) { - sinfg::warning("audio-write_frame: unable to write the entire audio frame"); + synfig::warning("audio-write_frame: unable to write the entire audio frame"); return 0; } @@ -297,7 +297,7 @@ public: { if(!formatc || !stream) { - sinfg::warning("Attempt to open a video codec with a bad format or stream"); + synfig::warning("Attempt to open a video codec with a bad format or stream"); return false; } @@ -312,14 +312,14 @@ public: codec = avcodec_find_encoder(context->codec_id); if(!codec) { - sinfg::warning("Open_video: could not find desired codec"); + synfig::warning("Open_video: could not find desired codec"); return 0; } //try to open the codec if(avcodec_open(context, codec) < 0) { - sinfg::warning("open_video: could not open desired codec"); + synfig::warning("open_video: could not open desired codec"); return 0; } @@ -334,7 +334,7 @@ public: /*picture = alloc_picture(PIX_FMT_RGBA32, context->width, context->height); if(!picture) { - sinfg::warning("open_video: could not allocate the picture to be encoded"); + synfig::warning("open_video: could not allocate the picture to be encoded"); return 0; }*/ @@ -354,7 +354,7 @@ public: encodable = alloc_picture(context->pix_fmt, context->width, context->height); if(!encodable) { - sinfg::warning("open_video: could not allocate encodable picture"); + synfig::warning("open_video: could not allocate encodable picture"); return 0; } } @@ -367,7 +367,7 @@ public: { if(!formatc || !stream) { - sinfg::warning("Attempt to open a video codec with a bad format or stream"); + synfig::warning("Attempt to open a video codec with a bad format or stream"); return false; } @@ -413,7 +413,7 @@ public: //error detect - possibly throw later... if(ret != 0) { - sinfg::warning("write_frame: error while writing video frame"); + synfig::warning("write_frame: error while writing video frame"); return false; } } @@ -519,13 +519,13 @@ public: if(!format) { - sinfg::warning("Unable to Guess the output, defaulting to mpeg"); + synfig::warning("Unable to Guess the output, defaulting to mpeg"); format = guess_format("mpeg", NULL, NULL); } if(!format) { - sinfg::warning("Unable to find output format"); + synfig::warning("Unable to find output format"); return 0; } @@ -533,7 +533,7 @@ public: formatc = (AVFormatContext *)av_mallocz(sizeof(AVFormatContext)); if(!formatc) { - sinfg::warning("Memory error\n"); + synfig::warning("Memory error\n"); return 0; } //set the output format to the one we found @@ -574,7 +574,7 @@ public: if(av_set_parameters(formatc, ap) < 0) { - sinfg::warning("Invalid output formatting parameters"); + synfig::warning("Invalid output formatting parameters"); return 0; } @@ -586,7 +586,7 @@ public: { if(!vid.open(formatc, video_st)) { - sinfg::warning("Could not open video encoder"); + synfig::warning("Could not open video encoder"); return 0; } } @@ -594,7 +594,7 @@ public: { if(!aud.open(formatc, audio_st)) { - sinfg::warning("Could not open audio encoder"); + synfig::warning("Could not open audio encoder"); return 0; } }*/ @@ -605,7 +605,7 @@ public: //use libav's file open function (what does it do differently????) if(url_fopen(&formatc->pb, filename, URL_WRONLY) < 0) { - sinfg::warning("Unable to open file: %s", filename); + synfig::warning("Unable to open file: %s", filename); return 0; } } @@ -615,7 +615,7 @@ public: picture = alloc_picture(PIX_FMT_RGB24,vInfo.w,vInfo.h);//video_st->codec.width, video_st->codec.height); if(!picture) { - sinfg::warning("Unable to allocate the temporary AVFrame surface"); + synfig::warning("Unable to allocate the temporary AVFrame surface"); return 0; } @@ -695,7 +695,7 @@ public: st = av_new_stream(formatc, 0); if(!st) { - sinfg::warning("video-add_stream: Unable to allocate stream"); + synfig::warning("video-add_stream: Unable to allocate stream"); return 0; } @@ -741,7 +741,7 @@ public: stream = av_new_stream(formatc, 1); if(!stream) { - sinfg::warning("could not alloc stream"); + synfig::warning("could not alloc stream"); return 0; } @@ -874,7 +874,7 @@ Target_LibAVCodec::end_frame() //encode the frame and write it to the file if(!data->vid.write_frame(formatc,video_st,data->picture)) { - sinfg::warning("Unable to write a frame"); + synfig::warning("Unable to write a frame"); } data->frame_count++; @@ -893,7 +893,7 @@ Target_LibAVCodec::end_frame() } bool -Target_LibAVCodec::start_frame(sinfg::ProgressCallback *callback) +Target_LibAVCodec::start_frame(synfig::ProgressCallback *callback) { //prepare all the color buffer stuff, etc. @@ -920,7 +920,7 @@ bool Target_LibAVCodec::init() //hardcode test for mpeg if(!data->Initialize(filename.c_str(),NULL)) { - sinfg::warning("Unable to Initialize the audio video encoders"); + synfig::warning("Unable to Initialize the audio video encoders"); return 0; } diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.h b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.h index a304575..8447fef 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.h +++ b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file trgt.h ** \brief Template Header ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_H -#define __SINFG_TRGT_H +#ifndef __SYNFIG_TRGT_H +#define __SYNFIG_TRGT_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include -#include "sinfg/surface.h" +#include "synfig/surface.h" /* === M A C R O S ========================================================= */ @@ -37,18 +37,18 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Target_LibAVCodec : public sinfg::Target_Scanline +class Target_LibAVCodec : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: - sinfg::String filename; + synfig::String filename; class LibAVEncoder; LibAVEncoder *data; static bool registered; - sinfg::Surface surface; + synfig::Surface surface; public: Target_LibAVCodec(const char *filename); @@ -56,10 +56,10 @@ public: virtual bool init(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_noise/Makefile.am b/synfig-core/trunk/src/modules/mod_noise/Makefile.am index efcebd0..5bc9c8c 100644 --- a/synfig-core/trunk/src/modules/mod_noise/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_noise/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_noise/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_noise/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -8,6 +8,6 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_noise.la libmod_noise_la_SOURCES = random.cpp random.h distort.cpp distort.h noise.cpp noise.h main.cpp -libmod_noise_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_noise_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_noise_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_noise_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ libmod_noise_la_LDFLAGS = -module -no-undefined diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.cpp b/synfig-core/trunk/src/modules/mod_noise/distort.cpp index fe9eb02..5175bd4 100644 --- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.cpp ** \brief blehh ** @@ -30,31 +30,31 @@ #include "distort.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(NoiseDistort); -SINFG_LAYER_SET_NAME(NoiseDistort,"noise_distort"); -SINFG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort")); -SINFG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions")); -SINFG_LAYER_SET_VERSION(NoiseDistort,"0.0"); -SINFG_LAYER_SET_CVS_ID(NoiseDistort,"$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_LAYER_INIT(NoiseDistort); +SYNFIG_LAYER_SET_NAME(NoiseDistort,"noise_distort"); +SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort")); +SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions")); +SYNFIG_LAYER_SET_VERSION(NoiseDistort,"0.0"); +SYNFIG_LAYER_SET_CVS_ID(NoiseDistort,"$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -119,27 +119,27 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c } inline float -NoiseDistort::calc_supersample(const sinfg::Point &x, float pw,float ph)const +NoiseDistort::calc_supersample(const synfig::Point &x, float pw,float ph)const { return 0.0f; } void -NoiseDistort::set_time(sinfg::Context context, sinfg::Time t)const +NoiseDistort::set_time(synfig::Context context, synfig::Time t)const { curr_time=t; context.set_time(t); } void -NoiseDistort::set_time(sinfg::Context context, sinfg::Time t, const sinfg::Point &point)const +NoiseDistort::set_time(synfig::Context context, synfig::Time t, const synfig::Point &point)const { curr_time=t; context.set_time(t,point); } -sinfg::Layer::Handle -NoiseDistort::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +NoiseDistort::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.h b/synfig-core/trunk/src/modules/mod_noise/distort.h index d5cde33..9793713 100644 --- a/synfig-core/trunk/src/modules/mod_noise/distort.h +++ b/synfig-core/trunk/src/modules/mod_noise/distort.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.h ** \brief Template Header ** @@ -21,16 +21,16 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_NOISE_DISTORT_H -#define __SINFG_NOISE_DISTORT_H +#ifndef __SYNFIG_NOISE_DISTORT_H +#define __SYNFIG_NOISE_DISTORT_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "random.h" /* === M A C R O S ========================================================= */ @@ -39,39 +39,39 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class NoiseDistort : public sinfg::Layer_Composite +class NoiseDistort : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Vector size; + synfig::Vector size; Random random; int smooth; int detail; - sinfg::Real speed; + synfig::Real speed; bool turbulent; - sinfg::Vector displacement; + synfig::Vector displacement; //void sync(); - mutable sinfg::Time curr_time; + mutable synfig::Time curr_time; - sinfg::Color color_func(const sinfg::Point &x, float supersample,sinfg::Context context)const; + synfig::Color color_func(const synfig::Point &x, float supersample,synfig::Context context)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; public: NoiseDistort(); - virtual bool set_param(const sinfg::String ¶m, const sinfg::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String ¶m)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; - //virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; - virtual void set_time(sinfg::Context context, sinfg::Time time)const; - virtual void set_time(sinfg::Context context, sinfg::Time time, const sinfg::Point &point)const; - virtual sinfg::Rect get_bounding_rect(sinfg::Context context)const; + virtual bool set_param(const synfig::String ¶m, const synfig::ValueBase &value); + virtual synfig::ValueBase get_param(const synfig::String ¶m)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; + //virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; + virtual void set_time(synfig::Context context, synfig::Time time)const; + virtual void set_time(synfig::Context context, synfig::Time time, const synfig::Point &point)const; + virtual synfig::Rect get_bounding_rect(synfig::Context context)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/mod_noise/main.cpp b/synfig-core/trunk/src/modules/mod_noise/main.cpp index ac5f657..4990334 100644 --- a/synfig-core/trunk/src/modules/mod_noise/main.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,10 +29,10 @@ # include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include "noise.h" #include "distort.h" @@ -47,7 +47,7 @@ MODULE_DESC_BEGIN(libmod_noise) MODULE_DESCRIPTION("writeme") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(libmod_noise) diff --git a/synfig-core/trunk/src/modules/mod_noise/noise.cpp b/synfig-core/trunk/src/modules/mod_noise/noise.cpp index c2643de..aef6ead 100644 --- a/synfig-core/trunk/src/modules/mod_noise/noise.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/noise.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.cpp ** \brief blehh ** @@ -30,31 +30,31 @@ #include "noise.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Noise); -SINFG_LAYER_SET_NAME(Noise,"noise"); -SINFG_LAYER_SET_LOCAL_NAME(Noise,_("Noise Gradient")); -SINFG_LAYER_SET_CATEGORY(Noise,_("Gradients")); -SINFG_LAYER_SET_VERSION(Noise,"0.0"); -SINFG_LAYER_SET_CVS_ID(Noise,"$Id: noise.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $"); +SYNFIG_LAYER_INIT(Noise); +SYNFIG_LAYER_SET_NAME(Noise,"noise"); +SYNFIG_LAYER_SET_LOCAL_NAME(Noise,_("Noise Gradient")); +SYNFIG_LAYER_SET_CATEGORY(Noise,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(Noise,"0.0"); +SYNFIG_LAYER_SET_CVS_ID(Noise,"$Id: noise.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -168,27 +168,27 @@ Noise::color_func(const Point &point, float pixel_size,Context context)const } inline float -Noise::calc_supersample(const sinfg::Point &x, float pw,float ph)const +Noise::calc_supersample(const synfig::Point &x, float pw,float ph)const { return 0.0f; } void -Noise::set_time(sinfg::Context context, sinfg::Time t)const +Noise::set_time(synfig::Context context, synfig::Time t)const { curr_time=t; context.set_time(t); } void -Noise::set_time(sinfg::Context context, sinfg::Time t, const sinfg::Point &point)const +Noise::set_time(synfig::Context context, synfig::Time t, const synfig::Point &point)const { curr_time=t; context.set_time(t,point); } -sinfg::Layer::Handle -Noise::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +Noise::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/modules/mod_noise/noise.h b/synfig-core/trunk/src/modules/mod_noise/noise.h index b997a3a..29b3341 100644 --- a/synfig-core/trunk/src/modules/mod_noise/noise.h +++ b/synfig-core/trunk/src/modules/mod_noise/noise.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.h ** \brief Template Header ** @@ -21,17 +21,17 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_NOISE_H -#define __SINFG_NOISE_H +#ifndef __SYNFIG_NOISE_H +#define __SYNFIG_NOISE_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include "random.h" /* === M A C R O S ========================================================= */ @@ -40,43 +40,43 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class Noise : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform +class Noise : public synfig::Layer_Composite, public synfig::Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - sinfg::Vector size; + synfig::Vector size; Random random; int smooth; int detail; bool do_alpha; - sinfg::Gradient gradient; - sinfg::Real speed; + synfig::Gradient gradient; + synfig::Real speed; bool turbulent; bool do_displacement; - sinfg::Vector displacement; + synfig::Vector displacement; //void sync(); - mutable sinfg::Time curr_time; + mutable synfig::Time curr_time; bool super_sample; - sinfg::Color color_func(const sinfg::Point &x, float supersample,sinfg::Context context)const; + synfig::Color color_func(const synfig::Point &x, float supersample,synfig::Context context)const; - float calc_supersample(const sinfg::Point &x, float pw,float ph)const; + float calc_supersample(const synfig::Point &x, float pw,float ph)const; public: Noise(); - virtual bool set_param(const sinfg::String ¶m, const sinfg::ValueBase &value); - virtual sinfg::ValueBase get_param(const sinfg::String ¶m)const; - virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const; - sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; - virtual void set_time(sinfg::Context context, sinfg::Time time)const; - virtual void set_time(sinfg::Context context, sinfg::Time time, const sinfg::Point &point)const; + virtual bool set_param(const synfig::String ¶m, const synfig::ValueBase &value); + virtual synfig::ValueBase get_param(const synfig::String ¶m)const; + virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const; + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const; + synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; + virtual void set_time(synfig::Context context, synfig::Time time)const; + virtual void set_time(synfig::Context context, synfig::Time time, const synfig::Point &point)const; virtual Vocab get_param_vocab()const; }; diff --git a/synfig-core/trunk/src/modules/mod_noise/random.cpp b/synfig-core/trunk/src/modules/mod_noise/random.cpp index f7a21ad..f2858f9 100644 --- a/synfig-core/trunk/src/modules/mod_noise/random.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/random.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.cpp ** \brief blehh ** diff --git a/synfig-core/trunk/src/modules/mod_noise/random.h b/synfig-core/trunk/src/modules/mod_noise/random.h index d1f10d4..d0d1737 100644 --- a/synfig-core/trunk/src/modules/mod_noise/random.h +++ b/synfig-core/trunk/src/modules/mod_noise/random.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_RANDOM_H -#define __SINFG_RANDOM_H +#ifndef __SYNFIG_RANDOM_H +#define __SYNFIG_RANDOM_H /* === H E A D E R S ======================================================= */ diff --git a/synfig-core/trunk/src/modules/mod_openexr/Makefile.am b/synfig-core/trunk/src/modules/mod_openexr/Makefile.am index bf41d41..299d00d 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_openexr/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_openexr/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_openexr/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -10,8 +10,8 @@ if WITH_OPENEXR module_LTLIBRARIES = libmod_openexr.la libmod_openexr_la_SOURCES = main.cpp mptr_openexr.cpp mptr_openexr.h trgt_openexr.cpp trgt_openexr.h libmod_openexr_la_LDFLAGS = -module @PNG_LIBS@ -no-undefined -libmod_openexr_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ -libmod_openexr_la_CXXFLAGS = @SINFG_CFLAGS@ +libmod_openexr_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ +libmod_openexr_la_CXXFLAGS = @SYNFIG_CFLAGS@ else endif diff --git a/synfig-core/trunk/src/modules/mod_openexr/main.cpp b/synfig-core/trunk/src/modules/mod_openexr/main.cpp index 08705b1..7637f9d 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/main.cpp +++ b/synfig-core/trunk/src/modules/mod_openexr/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -31,7 +31,7 @@ #warning HAVE_CONFIG_H not defined! #endif -#include +#include #include "trgt_openexr.h" #include "mptr_openexr.h" #endif diff --git a/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.cpp b/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.cpp index 74a3a38..ba08d1a 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.cpp +++ b/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: mptr_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -28,7 +28,7 @@ #endif #include "mptr_openexr.h" -#include +#include #include #include #include @@ -42,17 +42,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(exr_mptr); -SINFG_IMPORTER_SET_NAME(exr_mptr,"exr_mptr"); -SINFG_IMPORTER_SET_EXT(exr_mptr,"exr"); -SINFG_IMPORTER_SET_VERSION(exr_mptr,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(exr_mptr,"$Id: mptr_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_IMPORTER_INIT(exr_mptr); +SYNFIG_IMPORTER_SET_NAME(exr_mptr,"exr_mptr"); +SYNFIG_IMPORTER_SET_EXT(exr_mptr,"exr"); +SYNFIG_IMPORTER_SET_VERSION(exr_mptr,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(exr_mptr,"$Id: mptr_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -66,7 +66,7 @@ exr_mptr::~exr_mptr() } bool -exr_mptr::get_frame(sinfg::Surface &out_surface,Time, sinfg::ProgressCallback *cb) +exr_mptr::get_frame(synfig::Surface &out_surface,Time, synfig::ProgressCallback *cb) { try { @@ -109,7 +109,7 @@ exr_mptr::get_frame(sinfg::Surface &out_surface,Time, sinfg::ProgressCallback *c catch (const std::exception &e) { if(cb)cb->error(e.what()); - else sinfg::error(e.what()); + else synfig::error(e.what()); return false; } diff --git a/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h b/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h index e6f1b35..433e409 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h +++ b/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: mptr_openexr.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MPTR_OPENEXR_H -#define __SINFG_MPTR_OPENEXR_H +#ifndef __SYNFIG_MPTR_OPENEXR_H +#define __SYNFIG_MPTR_OPENEXR_H /* === H E A D E R S ======================================================= */ -#include +#include #include -#include +#include /* === M A C R O S ========================================================= */ @@ -35,19 +35,19 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class exr_mptr : public sinfg::Importer +class exr_mptr : public synfig::Importer { - SINFG_IMPORTER_MODULE_EXT + SYNFIG_IMPORTER_MODULE_EXT private: - sinfg::String filename; + synfig::String filename; public: exr_mptr(const char *filename); ~exr_mptr(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; diff --git a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp index 3e9db95..e8c851c 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp +++ b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** exr_trgt Target Module ** $Id: trgt_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -30,7 +30,7 @@ #endif #include "trgt_openexr.h" -#include +#include #include #include #include @@ -39,17 +39,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(exr_trgt); -SINFG_TARGET_SET_NAME(exr_trgt,"exr_trgt"); -SINFG_TARGET_SET_EXT(exr_trgt,"exr"); -SINFG_TARGET_SET_VERSION(exr_trgt,"1.0.4"); -SINFG_TARGET_SET_CVS_ID(exr_trgt,"$Id: trgt_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_TARGET_INIT(exr_trgt); +SYNFIG_TARGET_SET_NAME(exr_trgt,"exr_trgt"); +SYNFIG_TARGET_SET_EXT(exr_trgt,"exr"); +SYNFIG_TARGET_SET_VERSION(exr_trgt,"1.0.4"); +SYNFIG_TARGET_SET_CVS_ID(exr_trgt,"$Id: trgt_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -99,7 +99,7 @@ exr_trgt::set_rend_desc(RendDesc *given_desc) } bool -exr_trgt::start_frame(sinfg::ProgressCallback *cb) +exr_trgt::start_frame(synfig::ProgressCallback *cb) { int w=desc.get_w(),h=desc.get_h(); diff --git a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.h b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.h index 6c99668..a755bea 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.h +++ b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_openexr.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_OPENEXR_H -#define __SINFG_TRGT_OPENEXR_H +#ifndef __SYNFIG_TRGT_OPENEXR_H +#define __SYNFIG_TRGT_OPENEXR_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include #include #include #include @@ -39,18 +39,18 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class exr_trgt : public sinfg::Target_Scanline +class exr_trgt : public synfig::Target_Scanline { public: private: bool multi_image; int imagecount,scanline; - sinfg::String filename; + synfig::String filename; Imf::RgbaOutputFile *exr_file; Imf::Rgba *buffer; etl::surface out_surface; #ifndef USE_HALF_TYPE - sinfg::Color *buffer_color; + synfig::Color *buffer_color; #endif bool ready(); @@ -58,15 +58,15 @@ public: exr_trgt(const char *filename); virtual ~exr_trgt(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(void); - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_particle/Makefile.am b/synfig-core/trunk/src/modules/mod_particle/Makefile.am index 3cf1159..ff9b6ae 100644 --- a/synfig-core/trunk/src/modules/mod_particle/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_particle/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_particle/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_particle/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -8,6 +8,6 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_particle.la libmod_particle_la_SOURCES = random.cpp random.h plant.cpp plant.h main.cpp -libmod_particle_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_particle_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_particle_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_particle_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ libmod_particle_la_LDFLAGS = -module -no-undefined diff --git a/synfig-core/trunk/src/modules/mod_particle/main.cpp b/synfig-core/trunk/src/modules/mod_particle/main.cpp index 3ea7fcc..9a5466b 100644 --- a/synfig-core/trunk/src/modules/mod_particle/main.cpp +++ b/synfig-core/trunk/src/modules/mod_particle/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,9 +29,9 @@ # include #endif -#include -#include -#include +#include +#include +#include #include "plant.h" @@ -44,7 +44,7 @@ MODULE_DESC_BEGIN(libmod_particle) MODULE_DESCRIPTION("writeme") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(libmod_particle) diff --git a/synfig-core/trunk/src/modules/mod_particle/plant.cpp b/synfig-core/trunk/src/modules/mod_particle/plant.cpp index 69816f6..39a82f9 100644 --- a/synfig-core/trunk/src/modules/mod_particle/plant.cpp +++ b/synfig-core/trunk/src/modules/mod_particle/plant.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file bline.cpp ** \brief Template ** @@ -28,23 +28,23 @@ # include #endif -#include +#include #include "plant.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #endif @@ -55,18 +55,18 @@ using namespace etl; #define SAMPLES 300 #define ROUND_END_FACTOR (4) #define CUSP_THRESHOLD (0.15) -#define NO_LOOP_COOKIE sinfg::Vector(84951305,7836658) +#define NO_LOOP_COOKIE synfig::Vector(84951305,7836658) #define EPSILON (0.000000001) #define CUSP_TANGENT_ADJUST (0.025) /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Plant); -SINFG_LAYER_SET_NAME(Plant,"plant"); -SINFG_LAYER_SET_LOCAL_NAME(Plant,_("Plant")); -SINFG_LAYER_SET_CATEGORY(Plant,_("Particle Systems")); -SINFG_LAYER_SET_VERSION(Plant,"0.1"); -SINFG_LAYER_SET_CVS_ID(Plant,"$Id: plant.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $"); +SYNFIG_LAYER_INIT(Plant); +SYNFIG_LAYER_SET_NAME(Plant,"plant"); +SYNFIG_LAYER_SET_LOCAL_NAME(Plant,_("Plant")); +SYNFIG_LAYER_SET_CATEGORY(Plant,_("Particle Systems")); +SYNFIG_LAYER_SET_VERSION(Plant,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Plant,"$Id: plant.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -106,7 +106,7 @@ Plant::Plant(): } void -Plant::branch(int n,int depth,float t, float stunt_growth, sinfg::Point position,sinfg::Vector vel)const +Plant::branch(int n,int depth,float t, float stunt_growth, synfig::Point position,synfig::Vector vel)const { float next_split((1.0-t)/(splits-depth)+t/*+random_factor*random(40+depth,t*splits,0,0)/splits*/); for(;t=1.0-stunt_growth)return; - sinfg::Real sin_v=sinfg::Angle::cos(split_angle).get(); - sinfg::Real cos_v=sinfg::Angle::sin(split_angle).get(); + synfig::Real sin_v=synfig::Angle::cos(split_angle).get(); + synfig::Real cos_v=synfig::Angle::sin(split_angle).get(); - sinfg::Vector velocity1(vel[0]*sin_v-vel[1]*cos_v+random_factor*random(2,30+n+depth,t*splits,0.0f,0.0f),vel[0]*cos_v+vel[1]*sin_v+random_factor*random(2,32+n+depth,t*splits,0.0f,0.0f)); - sinfg::Vector velocity2(vel[0]*sin_v+vel[1]*cos_v+random_factor*random(2,31+n+depth,t*splits,0.0f,0.0f),-vel[0]*cos_v+vel[1]*sin_v+random_factor*random(2,33+n+depth,t*splits,0.0f,0.0f)); + synfig::Vector velocity1(vel[0]*sin_v-vel[1]*cos_v+random_factor*random(2,30+n+depth,t*splits,0.0f,0.0f),vel[0]*cos_v+vel[1]*sin_v+random_factor*random(2,32+n+depth,t*splits,0.0f,0.0f)); + synfig::Vector velocity2(vel[0]*sin_v+vel[1]*cos_v+random_factor*random(2,31+n+depth,t*splits,0.0f,0.0f),-vel[0]*cos_v+vel[1]*sin_v+random_factor*random(2,33+n+depth,t*splits,0.0f,0.0f)); Plant::branch(n,depth+1,t,stunt_growth,position,velocity1); Plant::branch(n,depth+1,t,stunt_growth,position,velocity2); @@ -139,7 +139,7 @@ Plant::branch(int n,int depth,float t, float stunt_growth, sinfg::Point position void Plant::calc_bounding_rect()const { - std::vector::const_iterator iter,next; + std::vector::const_iterator iter,next; bounding_rect=Rect::zero(); @@ -179,7 +179,7 @@ Plant::sync()const if(bline.size()<=2) return; - std::vector::const_iterator iter,next; + std::vector::const_iterator iter,next; etl::hermite curve; diff --git a/synfig-core/trunk/src/modules/mod_particle/plant.h b/synfig-core/trunk/src/modules/mod_particle/plant.h index 3380c00..bcda00d 100644 --- a/synfig-core/trunk/src/modules/mod_particle/plant.h +++ b/synfig-core/trunk/src/modules/mod_particle/plant.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file plant.h ** \brief Template Header ** @@ -21,21 +21,21 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_PLANT_H -#define __SINFG_PLANT_H +#ifndef __SYNFIG_PLANT_H +#define __SYNFIG_PLANT_H /* === H E A D E R S ======================================================= */ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "random.h" -#include +#include /* === M A C R O S ========================================================= */ @@ -43,48 +43,48 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; -class Plant : public sinfg::Layer_Composite +class Plant : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: - std::vector bline; + std::vector bline; bool bline_loop; - sinfg::Gradient gradient; + synfig::Gradient gradient; struct Particle { - sinfg::Point point; - sinfg::Color color; + synfig::Point point; + synfig::Color color; - Particle(const sinfg::Point &point,const sinfg::Color& color): + Particle(const synfig::Point &point,const synfig::Color& color): point(point),color(color) { } }; mutable std::vector particle_list; - mutable sinfg::Rect bounding_rect; - sinfg::Angle split_angle; - sinfg::Vector gravity; - sinfg::Real velocity; - sinfg::Real step; - sinfg::Real mass; - sinfg::Real drag; - sinfg::Real size; + mutable synfig::Rect bounding_rect; + synfig::Angle split_angle; + synfig::Vector gravity; + synfig::Real velocity; + synfig::Real step; + synfig::Real mass; + synfig::Real drag; + synfig::Real size; int splits; int sprouts; - sinfg::Real random_factor; + synfig::Real random_factor; Random random; bool size_as_alpha; mutable bool needs_sync_; - void branch(int n, int depth,float t, float stunt_growth, sinfg::Point position,sinfg::Vector velocity)const; + void branch(int n, int depth,float t, float stunt_growth, synfig::Point position,synfig::Vector velocity)const; public: @@ -94,15 +94,15 @@ public: void calc_bounding_rect()const; - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Vocab get_param_vocab()const; - virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const;\ + virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const;\ - virtual sinfg::Rect get_bounding_rect(sinfg::Context context)const; + virtual synfig::Rect get_bounding_rect(synfig::Context context)const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_particle/random.cpp b/synfig-core/trunk/src/modules/mod_particle/random.cpp index c90772e..c31fe44 100644 --- a/synfig-core/trunk/src/modules/mod_particle/random.cpp +++ b/synfig-core/trunk/src/modules/mod_particle/random.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.cpp ** \brief blehh ** diff --git a/synfig-core/trunk/src/modules/mod_particle/random.h b/synfig-core/trunk/src/modules/mod_particle/random.h index 4dcbd83..49a3ae7 100644 --- a/synfig-core/trunk/src/modules/mod_particle/random.h +++ b/synfig-core/trunk/src/modules/mod_particle/random.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file noise.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_RANDOM_H -#define __SINFG_RANDOM_H +#ifndef __SYNFIG_RANDOM_H +#define __SYNFIG_RANDOM_H /* === H E A D E R S ======================================================= */ diff --git a/synfig-core/trunk/src/modules/mod_png/Makefile.am b/synfig-core/trunk/src/modules/mod_png/Makefile.am index af3c237..6c21ceb 100644 --- a/synfig-core/trunk/src/modules/mod_png/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_png/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_png/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_png/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -10,7 +10,7 @@ if HAVE_LIBPNG module_LTLIBRARIES = libmod_png.la libmod_png_la_SOURCES = main.cpp trgt_png.cpp trgt_png.h mptr_png.cpp mptr_png.h libmod_png_la_LDFLAGS = -module @PNG_LIBS@ -no-undefined -libmod_png_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_png_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_png_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_png_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ else endif diff --git a/synfig-core/trunk/src/modules/mod_png/main.cpp b/synfig-core/trunk/src/modules/mod_png/main.cpp index 09ad9a2..954d769 100644 --- a/synfig-core/trunk/src/modules/mod_png/main.cpp +++ b/synfig-core/trunk/src/modules/mod_png/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "trgt_png.h" #include "mptr_png.h" #endif @@ -41,7 +41,7 @@ MODULE_DESC_BEGIN(mod_png) MODULE_DESCRIPTION("Provides a PNG target and importer") MODULE_AUTHOR("Robert B. Quattlebaum Jr") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_png) diff --git a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp index 4bfc6de..0c83653 100644 --- a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: mptr_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -34,9 +34,9 @@ #endif #include "mptr_png.h" -#include -#include -#include +#include +#include +#include #include @@ -46,7 +46,7 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -54,11 +54,11 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(png_mptr); -SINFG_IMPORTER_SET_NAME(png_mptr,"png_mptr"); -SINFG_IMPORTER_SET_EXT(png_mptr,"png"); -SINFG_IMPORTER_SET_VERSION(png_mptr,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(png_mptr,"$Id: mptr_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_IMPORTER_INIT(png_mptr); +SYNFIG_IMPORTER_SET_NAME(png_mptr,"png_mptr"); +SYNFIG_IMPORTER_SET_EXT(png_mptr,"png"); +SYNFIG_IMPORTER_SET_VERSION(png_mptr,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(png_mptr,"$Id: mptr_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -66,7 +66,7 @@ void png_mptr::png_out_error(png_struct *png_data,const char *msg) { //png_mptr *me=(png_mptr*)png_data->error_ptr; - sinfg::error(strprintf("png_mptr: error: %s",msg)); + synfig::error(strprintf("png_mptr: error: %s",msg)); //me->ready=false; } @@ -74,7 +74,7 @@ void png_mptr::png_out_warning(png_struct *png_data,const char *msg) { //png_mptr *me=(png_mptr*)png_data->error_ptr; - sinfg::warning(strprintf("png_mptr: warning: %s",msg)); + synfig::warning(strprintf("png_mptr: warning: %s",msg)); //me->ready=false; } @@ -161,7 +161,7 @@ png_mptr::png_mptr(const char *file_name) double fgamma; if (png_get_gAMA(png_ptr, info_ptr, &fgamma)) { - sinfg::info("PNG: Image gamma is %f",fgamma); + synfig::info("PNG: Image gamma is %f",fgamma); png_set_gamma(png_ptr, gamma().get_gamma(), fgamma); } @@ -169,7 +169,7 @@ png_mptr::png_mptr(const char *file_name) /* if (setjmp(png_jmpbuf(png_ptr))) { - sinfg::error("Unable to setup longjump"); + synfig::error("Unable to setup longjump"); png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); fclose(file); //! \todo THROW SOMETHING @@ -279,7 +279,7 @@ png_mptr::png_mptr(const char *file_name) break; case PNG_COLOR_TYPE_PALETTE: - sinfg::warning("png_mptr: Paletted PNGs aren't yet fully supported."); + synfig::warning("png_mptr: Paletted PNGs aren't yet fully supported."); for(y=0;y -#include -#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -36,12 +36,12 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class png_mptr : public sinfg::Importer +class png_mptr : public synfig::Importer { - SINFG_IMPORTER_MODULE_EXT + SYNFIG_IMPORTER_MODULE_EXT private: - sinfg::String filename; - sinfg::Surface surface_buffer; + synfig::String filename; + synfig::Surface surface_buffer; png_structp png_ptr; png_infop info_ptr; @@ -55,7 +55,7 @@ public: png_mptr(const char *filename); ~png_mptr(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp index 279ea56..74ee543 100644 --- a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** png_trgt Target Module ** $Id: trgt_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -41,17 +41,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(png_trgt); -SINFG_TARGET_SET_NAME(png_trgt,"png"); -SINFG_TARGET_SET_EXT(png_trgt,"png"); -SINFG_TARGET_SET_VERSION(png_trgt,"0.1"); -SINFG_TARGET_SET_CVS_ID(png_trgt,"$Id: trgt_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_TARGET_INIT(png_trgt); +SYNFIG_TARGET_SET_NAME(png_trgt,"png"); +SYNFIG_TARGET_SET_EXT(png_trgt,"png"); +SYNFIG_TARGET_SET_VERSION(png_trgt,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(png_trgt,"$Id: trgt_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -59,7 +59,7 @@ void png_trgt::png_out_error(png_struct *png_data,const char *msg) { png_trgt *me=(png_trgt*)png_data->error_ptr; - sinfg::error(strprintf("png_trgt: error: %s",msg)); + synfig::error(strprintf("png_trgt: error: %s",msg)); me->ready=false; } @@ -67,7 +67,7 @@ void png_trgt::png_out_warning(png_struct *png_data,const char *msg) { png_trgt *me=(png_trgt*)png_data->error_ptr; - sinfg::warning(strprintf("png_trgt: warning: %s",msg)); + synfig::warning(strprintf("png_trgt: warning: %s",msg)); me->ready=false; } @@ -122,7 +122,7 @@ png_trgt::end_frame() } bool -png_trgt::start_frame(sinfg::ProgressCallback *callback) +png_trgt::start_frame(synfig::ProgressCallback *callback) { int w=desc.get_w(),h=desc.get_h(); @@ -162,7 +162,7 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback) png_ptr=png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)this,png_out_error, png_out_warning); if (!png_ptr) { - sinfg::error("Unable to setup PNG struct"); + synfig::error("Unable to setup PNG struct"); fclose(file); return false; } @@ -170,7 +170,7 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback) info_ptr= png_create_info_struct(png_ptr); if (!info_ptr) { - sinfg::error("Unable to setup PNG info struct"); + synfig::error("Unable to setup PNG info struct"); fclose(file); png_destroy_write_struct(&png_ptr,(png_infopp)NULL); return false; @@ -178,7 +178,7 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback) if (setjmp(png_jmpbuf(png_ptr))) { - sinfg::error("Unable to setup longjump"); + synfig::error("Unable to setup longjump"); png_destroy_write_struct(&png_ptr, &info_ptr); fclose(file); return false; @@ -202,7 +202,7 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback) { PNG_TEXT_COMPRESSION_NONE, "Title", const_cast(get_canvas()->get_name().c_str()) }, { PNG_TEXT_COMPRESSION_NONE, "Description", const_cast(get_canvas()->get_description().c_str()) }, { PNG_TEXT_COMPRESSION_NONE, "Copyright", "(c) 2004 Voria Studios, LLC" }, - { PNG_TEXT_COMPRESSION_NONE, "Software", "SINFG" }, + { PNG_TEXT_COMPRESSION_NONE, "Software", "SYNFIG" }, }; png_set_text(png_ptr,info_ptr,comments,sizeof(comments)/sizeof(png_text)); diff --git a/synfig-core/trunk/src/modules/mod_png/trgt_png.h b/synfig-core/trunk/src/modules/mod_png/trgt_png.h index 2aa4523..245891e 100644 --- a/synfig-core/trunk/src/modules/mod_png/trgt_png.h +++ b/synfig-core/trunk/src/modules/mod_png/trgt_png.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_png.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,13 +20,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_PNG_H -#define __SINFG_TRGT_PNG_H +#ifndef __SYNFIG_TRGT_PNG_H +#define __SYNFIG_TRGT_PNG_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include #include @@ -36,9 +36,9 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class png_trgt : public sinfg::Target_Scanline +class png_trgt : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: FILE *file; int w,h; @@ -49,18 +49,18 @@ private: static void png_out_warning(png_struct *png,const char *msg); bool multi_image,ready; int imagecount; - sinfg::String filename; + synfig::String filename; unsigned char *buffer; - sinfg::Color *color_buffer; + synfig::Color *color_buffer; public: png_trgt(const char *filename); virtual ~png_trgt(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_ppm/Makefile.am b/synfig-core/trunk/src/modules/mod_ppm/Makefile.am index bdb2076..0857432 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_ppm/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_ppm/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_ppm/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -9,5 +9,5 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_ppm.la libmod_ppm_la_SOURCES = main.cpp trgt_ppm.cpp trgt_ppm.h mptr_ppm.cpp mptr_ppm.h # trgt_mpg.cpp trgt_mpg.h libmod_ppm_la_LDFLAGS = -module -no-undefined -libmod_ppm_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_ppm_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_ppm_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_ppm_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ diff --git a/synfig-core/trunk/src/modules/mod_ppm/main.cpp b/synfig-core/trunk/src/modules/mod_ppm/main.cpp index bf0e62e..5c4e9d5 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/main.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "trgt_ppm.h" #include "mptr_ppm.h" #endif @@ -41,7 +41,7 @@ MODULE_DESC_BEGIN(mod_ppm) MODULE_DESCRIPTION("Provides a PPM target") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_ppm) diff --git a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp index c6f18a4..48ca707 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: mptr_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -28,11 +28,11 @@ #endif #include "mptr_ppm.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -42,17 +42,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(ppm_mptr); -SINFG_IMPORTER_SET_NAME(ppm_mptr,"ppm_mptr"); -SINFG_IMPORTER_SET_EXT(ppm_mptr,"ppm"); -SINFG_IMPORTER_SET_VERSION(ppm_mptr,"0.1"); -SINFG_IMPORTER_SET_CVS_ID(ppm_mptr,"$Id: mptr_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_IMPORTER_INIT(ppm_mptr); +SYNFIG_IMPORTER_SET_NAME(ppm_mptr,"ppm_mptr"); +SYNFIG_IMPORTER_SET_EXT(ppm_mptr,"ppm"); +SYNFIG_IMPORTER_SET_VERSION(ppm_mptr,"0.1"); +SYNFIG_IMPORTER_SET_CVS_ID(ppm_mptr,"$Id: mptr_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -66,7 +66,7 @@ ppm_mptr::~ppm_mptr() } bool -ppm_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) +ppm_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) { SmartFILE file(fopen(filename.c_str(),"rb")); if(!file) diff --git a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h index 57c6db7..3dc694a 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h +++ b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: mptr_ppm.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,13 +20,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MPTR_PPM_H -#define __SINFG_MPTR_PPM_H +#ifndef __SYNFIG_MPTR_PPM_H +#define __SYNFIG_MPTR_PPM_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include /* === M A C R O S ========================================================= */ @@ -34,16 +34,16 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class ppm_mptr : public sinfg::Importer +class ppm_mptr : public synfig::Importer { - SINFG_IMPORTER_MODULE_EXT + SYNFIG_IMPORTER_MODULE_EXT private: - sinfg::String filename; + synfig::String filename; public: ppm_mptr(const char *filename); ~ppm_mptr(); - virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *); + virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *); }; // END of class ppm_mptr /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.cpp b/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.cpp index 4c583b4..7c6cab3 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bsd_mpeg1 Target Module ** $Id: trgt_mpg.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -39,7 +39,7 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -191,7 +191,7 @@ bsd_mpeg1::end_frame() } bool -bsd_mpeg1::start_frame(sinfg::ProgressCallback *callback) +bsd_mpeg1::start_frame(synfig::ProgressCallback *callback) { return passthru->start_frame(callback); } diff --git a/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.h b/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.h index 7ad1505..99ac984 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.h +++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_mpg.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_mpg.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,12 +20,12 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_MPG_H -#define __SINFG_TRGT_MPG_H +#ifndef __SYNFIG_TRGT_MPG_H +#define __SYNFIG_TRGT_MPG_H /* === H E A D E R S ======================================================= */ -#include +#include #include #include "trgt_ppm.h" @@ -36,19 +36,19 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class bsd_mpeg1 : public sinfg::Target +class bsd_mpeg1 : public synfig::Target { public: private: -// sinfg::RendDesc desc; - sinfg::Target *passthru; +// synfig::RendDesc desc; + synfig::Target *passthru; String filename; FILE *paramfile; public: bsd_mpeg1(const char *filename); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); virtual ~bsd_mpeg1(); @@ -57,7 +57,7 @@ public: virtual unsigned char * start_scanline(int scanline); virtual bool end_scanline(void); - static sinfg::Target *New(const char *filename); + static synfig::Target *New(const char *filename); static const char Name[]; static const char Ext[]; diff --git a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp index 1477aa8..74acd44 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: trgt_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -30,7 +30,7 @@ #endif #include "trgt_ppm.h" -#include +#include #include #include #include @@ -39,17 +39,17 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(ppm); -SINFG_TARGET_SET_NAME(ppm,"ppm"); -SINFG_TARGET_SET_EXT(ppm,"ppm"); -SINFG_TARGET_SET_VERSION(ppm,"0.1"); -SINFG_TARGET_SET_CVS_ID(ppm,"$Id: trgt_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_TARGET_INIT(ppm); +SYNFIG_TARGET_SET_NAME(ppm,"ppm"); +SYNFIG_TARGET_SET_EXT(ppm,"ppm"); +SYNFIG_TARGET_SET_VERSION(ppm,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(ppm,"$Id: trgt_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -88,7 +88,7 @@ ppm::end_frame() } bool -ppm::start_frame(sinfg::ProgressCallback *callback) +ppm::start_frame(synfig::ProgressCallback *callback) { int w=desc.get_w(),h=desc.get_h(); diff --git a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.h b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.h index 811f63c..23b8420 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.h +++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: trgt_ppm.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,14 +20,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_PPM_H -#define __SINFG_TRGT_PPM_H +#ifndef __SYNFIG_TRGT_PPM_H +#define __SYNFIG_TRGT_PPM_H /* === H E A D E R S ======================================================= */ -#include -#include -#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -36,26 +36,26 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class ppm : public sinfg::Target_Scanline +class ppm : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: int imagecount; bool multi_image; - sinfg::SmartFILE file; - sinfg::String filename; - sinfg::Color *color_buffer; + synfig::SmartFILE file; + synfig::String filename; + synfig::Color *color_buffer; unsigned char *buffer; public: ppm(const char *filename); virtual ~ppm(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color * start_scanline(int scanline); + virtual synfig::Color * start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am b/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am index 2d318f2..82588ad 100644 --- a/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mod_yuv420p/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mod_yuv420p/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -9,5 +9,5 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmod_yuv420p.la libmod_yuv420p_la_SOURCES = main.cpp trgt_yuv.cpp trgt_yuv.h libmod_yuv420p_la_LDFLAGS = -module -no-undefined -libmod_yuv420p_la_CXXFLAGS = @SINFG_CFLAGS@ -libmod_yuv420p_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmod_yuv420p_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libmod_yuv420p_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/main.cpp b/synfig-core/trunk/src/modules/mod_yuv420p/main.cpp index 9e49fa8..9a92b56 100644 --- a/synfig-core/trunk/src/modules/mod_yuv420p/main.cpp +++ b/synfig-core/trunk/src/modules/mod_yuv420p/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "trgt_yuv.h" #endif @@ -40,7 +40,7 @@ MODULE_DESC_BEGIN(mod_yuv420p) MODULE_DESCRIPTION("writeme") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mod_yuv420p) diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp b/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp index 22ad4d8..57c8beb 100644 --- a/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp +++ b/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file trgt_yuv.cpp ** \brief Template File ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_TARGET +#define SYNFIG_TARGET #ifdef USING_PCH # include "pch.h" @@ -37,7 +37,7 @@ #include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -53,11 +53,11 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_TARGET_INIT(yuv); -SINFG_TARGET_SET_NAME(yuv,"yuv420p"); -SINFG_TARGET_SET_EXT(yuv,"yuv"); -SINFG_TARGET_SET_VERSION(yuv,"0.1"); -SINFG_TARGET_SET_CVS_ID(yuv,"$Id: trgt_yuv.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_TARGET_INIT(yuv); +SYNFIG_TARGET_SET_NAME(yuv,"yuv420p"); +SYNFIG_TARGET_SET_EXT(yuv,"yuv"); +SYNFIG_TARGET_SET_VERSION(yuv,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(yuv,"$Id: trgt_yuv.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -92,7 +92,7 @@ yuv::set_rend_desc(RendDesc *given_desc) } bool -yuv::start_frame(sinfg::ProgressCallback *callback) +yuv::start_frame(synfig::ProgressCallback *callback) { return static_cast(file); } diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.h b/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.h index 4991733..a6edc3b 100644 --- a/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.h +++ b/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file trgt_yuv.h ** \brief Template File ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRGT_PPM_H -#define __SINFG_TRGT_PPM_H +#ifndef __SYNFIG_TRGT_PPM_H +#define __SYNFIG_TRGT_PPM_H /* === H E A D E R S ======================================================= */ -#include -#include -#include -#include +#include +#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -38,15 +38,15 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class yuv : public sinfg::Target_Scanline +class yuv : public synfig::Target_Scanline { - SINFG_TARGET_MODULE_EXT + SYNFIG_TARGET_MODULE_EXT private: - sinfg::String filename; - sinfg::SmartFILE file; - sinfg::Surface surface; + synfig::String filename; + synfig::SmartFILE file; + synfig::Surface surface; bool dithering; @@ -55,11 +55,11 @@ public: yuv(const char *filename); virtual ~yuv(); - virtual bool set_rend_desc(sinfg::RendDesc *desc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); - virtual sinfg::Color* start_scanline(int scanline); + virtual synfig::Color* start_scanline(int scanline); virtual bool end_scanline(); }; diff --git a/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am b/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am index e18f46e..2cfa2ca 100644 --- a/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am +++ b/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/modules/mptr_mplayer/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/modules/mptr_mplayer/Makefile.am,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -9,7 +9,7 @@ moduledir=@MODULE_DIR@ module_LTLIBRARIES = libmptr_mplayer.la libmptr_mplayer_la_SOURCES = main.cpp mptr_mplayer.cpp mptr_mplayer.h libmptr_mplayer_la_LDFLAGS = -module -no-undefined -libmptr_mplayer_la_LIBADD = -L../../sinfg -lsinfg @SINFG_LIBS@ +libmptr_mplayer_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ diff --git a/synfig-core/trunk/src/modules/mptr_mplayer/main.cpp b/synfig-core/trunk/src/modules/mptr_mplayer/main.cpp index eb2cba1..dbbbc16 100644 --- a/synfig-core/trunk/src/modules/mptr_mplayer/main.cpp +++ b/synfig-core/trunk/src/modules/mptr_mplayer/main.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** bleh ** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_MODULE +#define SYNFIG_MODULE #ifdef USING_PCH # include "pch.h" @@ -29,7 +29,7 @@ # include #endif -#include +#include #include "mptr_mplayer.h" #endif @@ -40,7 +40,7 @@ MODULE_DESC_BEGIN(mptr_mplayer) MODULE_DESCRIPTION("ARGH") MODULE_AUTHOR("Robert B. Quattlebaum") MODULE_VERSION("1.0") - MODULE_COPYRIGHT(SINFG_COPYRIGHT) + MODULE_COPYRIGHT(SYNFIG_COPYRIGHT) MODULE_DESC_END MODULE_INVENTORY_BEGIN(mptr_mplayer) diff --git a/synfig-core/trunk/src/modules/mptr_mplayer/mptr_mplayer.cpp b/synfig-core/trunk/src/modules/mptr_mplayer/mptr_mplayer.cpp index d1c6fb4..4f796a4 100644 --- a/synfig-core/trunk/src/modules/mptr_mplayer/mptr_mplayer.cpp +++ b/synfig-core/trunk/src/modules/mptr_mplayer/mptr_mplayer.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** ppm Target Module ** $Id: mptr_mplayer.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -27,7 +27,7 @@ # include #endif -#include +#include #include #include "mptr_mplayer.h" #include @@ -39,7 +39,7 @@ /* === M A C R O S ========================================================= */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -66,11 +66,11 @@ mplayer_mptr::~mplayer_mptr() } bool -mplayer_mptr::GetFrame(Time time, sinfg::Surface &surface, sinfg::ProgressCallback *) +mplayer_mptr::GetFrame(Time time, synfig::Surface &surface, synfig::ProgressCallback *) { int ret; ret=system( - strprintf("/usr/local/bin/mencoder \"%s\" -ovc rawrgb -ss %f -endpos 0 -nosound -o /tmp/tmp.sinfg.rgbdata | grep \"VIDEO\" > /tmp/tmp.sinfg.size", + strprintf("/usr/local/bin/mencoder \"%s\" -ovc rawrgb -ss %f -endpos 0 -nosound -o /tmp/tmp.synfig.rgbdata | grep \"VIDEO\" > /tmp/tmp.synfig.size", filename.c_str(), time ).c_str() @@ -82,16 +82,16 @@ mplayer_mptr::GetFrame(Time time, sinfg::Surface &surface, sinfg::ProgressCallba return false; } */ - FILE *sizefile=fopen("/tmp/tmp.sinfg.size","rt"); - FILE *rgbfile=fopen("/tmp/tmp.sinfg.rgbdata","rb"); + FILE *sizefile=fopen("/tmp/tmp.synfig.size","rt"); + FILE *rgbfile=fopen("/tmp/tmp.synfig.rgbdata","rb"); if(!rgbfile) { - cerr<<"unable to open /tmp/tmp.sinfg.rgbdata"< +#include #include #include "string.h" @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -class mplayer_mptr : public sinfg::Importer +class mplayer_mptr : public synfig::Importer { public: private: @@ -49,9 +49,9 @@ public: static const char Name[]; static const char Ext[]; - virtual bool GetFrame(sinfg::Time time, sinfg::Surface &, sinfg::ProgressCallback *); + virtual bool GetFrame(synfig::Time time, synfig::Surface &, synfig::ProgressCallback *); - static sinfg::Importer *New(const char *filename); + static synfig::Importer *New(const char *filename); }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index f8f712f..a49578e 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/sinfg/Makefile.am,v 1.3 2005/01/21 19:29:10 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/synfig/Makefile.am,v 1.3 2005/01/21 19:29:10 darco Exp $ # SUBDIRS=proto @@ -20,14 +20,14 @@ VALUENODESOURCES=valuenode_sine.cpp valuenode_radialcomposite.cpp valuenode_blin VALUEHEADERS=blinepoint.h gradient.h value.h VALUESOURCES=blinepoint.cpp gradient.cpp value.cpp -SINFGHEADERS=surfacenew.h mutex.h timepointcollect.h interpolation.h guidset.h guid.h rect.h node.h smartfile.h distance.h palette.h main.h waypoint.h activepoint.h gamma.h uniqueid.h canvasbase.h context.h real.h paramdesc.h string_decl.h angle.h keyframe.h sinfg.h renddesc.h general.h importer.h surface.h module.h layer.h vector.h color.h canvas.h render.h target.h loadcanvas.h savecanvas.h valuenode.h version.h segment.h types.h exception.h string.h time.h blur.h transform.h curve_helper.h polynomial_root.h curveset.h -SINFGSOURCES=mutex.cpp timepointcollect.cpp rect.cpp node.cpp guid.cpp loadcanvas.cpp distance.cpp palette.cpp paramdesc.cpp waypoint.cpp activepoint.cpp gamma.cpp uniqueid.cpp context.cpp renddesc.cpp time.cpp exception.cpp keyframe.cpp main.cpp surface.cpp module.cpp importer.cpp layer.cpp color.cpp canvas.cpp render.cpp target.cpp savecanvas.cpp valuenode.cpp blur.cpp curve_helper.cpp polynomial_root.cpp transform.cpp curveset.cpp +SYNFIGHEADERS=surfacenew.h mutex.h timepointcollect.h interpolation.h guidset.h guid.h rect.h node.h smartfile.h distance.h palette.h main.h waypoint.h activepoint.h gamma.h uniqueid.h canvasbase.h context.h real.h paramdesc.h string_decl.h angle.h keyframe.h synfig.h renddesc.h general.h importer.h surface.h module.h layer.h vector.h color.h canvas.h render.h target.h loadcanvas.h savecanvas.h valuenode.h version.h segment.h types.h exception.h string.h time.h blur.h transform.h curve_helper.h polynomial_root.h curveset.h +SYNFIGSOURCES=mutex.cpp timepointcollect.cpp rect.cpp node.cpp guid.cpp loadcanvas.cpp distance.cpp palette.cpp paramdesc.cpp waypoint.cpp activepoint.cpp gamma.cpp uniqueid.cpp context.cpp renddesc.cpp time.cpp exception.cpp keyframe.cpp main.cpp surface.cpp module.cpp importer.cpp layer.cpp color.cpp canvas.cpp render.cpp target.cpp savecanvas.cpp valuenode.cpp blur.cpp curve_helper.cpp polynomial_root.cpp transform.cpp curveset.cpp -lib_LTLIBRARIES = libsinfg.la -libsinfg_la_SOURCES = $(VALUEHEADERS) $(VALUESOURCES) $(LAYERSOURCES) $(LAYERHEADERS) $(TARGETHEADERS) $(TARGETSOURCES) $(VALUENODEHEADERS) $(VALUENODESOURCES) $(SINFGHEADERS) $(SINFGSOURCES) $(IMPORTERHEADERS) $(IMPORTERSOURCES) -libsinfg_la_LIBADD = @LIBLTDL@ @SINFG_LIBS@ @LIBADD_DL@ -libsinfg_la_CXXFLAGS = @SINFG_CFLAGS@ -DLIBDIR="\"@libdir@\"" -DSYSCONFDIR="\"@sysconfdir@\"" -libsinfg_la_LDFLAGS = -export-dynamic -no-undefined -version-info 0:0:0 +lib_LTLIBRARIES = libsynfig.la +libsynfig_la_SOURCES = $(VALUEHEADERS) $(VALUESOURCES) $(LAYERSOURCES) $(LAYERHEADERS) $(TARGETHEADERS) $(TARGETSOURCES) $(VALUENODEHEADERS) $(VALUENODESOURCES) $(SYNFIGHEADERS) $(SYNFIGSOURCES) $(IMPORTERHEADERS) $(IMPORTERSOURCES) +libsynfig_la_LIBADD = @LIBLTDL@ @SYNFIG_LIBS@ @LIBADD_DL@ +libsynfig_la_CXXFLAGS = @SYNFIG_CFLAGS@ -DLIBDIR="\"@libdir@\"" -DSYSCONFDIR="\"@sysconfdir@\"" +libsynfig_la_LDFLAGS = -export-dynamic -no-undefined -version-info 0:0:0 -include_sinfgdir=@sinfgincludedir@/sinfg -include_sinfg_HEADERS = $(SINFGHEADERS) $(LAYERHEADERS) $(TARGETHEADERS) $(VALUENODEHEADERS) $(IMPORTERHEADERS) $(VALUEHEADERS) +include_synfigdir=@synfigincludedir@/synfig +include_synfig_HEADERS = $(SYNFIGHEADERS) $(LAYERHEADERS) $(TARGETHEADERS) $(VALUENODEHEADERS) $(IMPORTERHEADERS) $(VALUEHEADERS) diff --git a/synfig-core/trunk/src/synfig/activepoint.cpp b/synfig-core/trunk/src/synfig/activepoint.cpp index 75ddb4c..17a00fa 100644 --- a/synfig-core/trunk/src/synfig/activepoint.cpp +++ b/synfig-core/trunk/src/synfig/activepoint.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file activepoint.cpp ** \brief Template File ** @@ -37,7 +37,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -47,7 +47,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::GUID +synfig::GUID Activepoint::get_guid()const { return GUID::hasher(get_uid()); diff --git a/synfig-core/trunk/src/synfig/activepoint.h b/synfig-core/trunk/src/synfig/activepoint.h index 37e6397..316a079 100644 --- a/synfig-core/trunk/src/synfig/activepoint.h +++ b/synfig-core/trunk/src/synfig/activepoint.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file activepoint.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_ACTIVEPOINT_H -#define __SINFG_ACTIVEPOINT_H +#ifndef __SYNFIG_ACTIVEPOINT_H +#define __SYNFIG_ACTIVEPOINT_H /* === H E A D E R S ======================================================= */ @@ -36,7 +36,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class GUID; class ValueNode; @@ -80,7 +80,7 @@ public: GUID get_guid()const; }; // END of struct ValueNode_BLine::Activepoint -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/angle.h b/synfig-core/trunk/src/synfig/angle.h index 9cb64bb..19f6c30 100644 --- a/synfig-core/trunk/src/synfig/angle.h +++ b/synfig-core/trunk/src/synfig/angle.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file angle.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_ANGLE_H -#define __SINFG_ANGLE_H +#ifndef __SYNFIG_ANGLE_H +#define __SYNFIG_ANGLE_H /* === H E A D E R S ======================================================= */ @@ -34,14 +34,14 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \typedef Angle ** \todo writeme */ typedef etl::angle Angle; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/blinepoint.cpp b/synfig-core/trunk/src/synfig/blinepoint.cpp index 71cd2e2..e777dda 100644 --- a/synfig-core/trunk/src/synfig/blinepoint.cpp +++ b/synfig-core/trunk/src/synfig/blinepoint.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file blinepoint.cpp ** \brief Template File ** @@ -35,7 +35,7 @@ /* === U S I N G =========================================================== */ using namespace std; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -46,7 +46,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ void -sinfg::BLinePoint::reverse() +synfig::BLinePoint::reverse() { if(split_tangent_) { diff --git a/synfig-core/trunk/src/synfig/blinepoint.h b/synfig-core/trunk/src/synfig/blinepoint.h index a5302b3..672677a 100644 --- a/synfig-core/trunk/src/synfig/blinepoint.h +++ b/synfig-core/trunk/src/synfig/blinepoint.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file blinepoint.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_BLINEPOINT_H -#define __SINFG_BLINEPOINT_H +#ifndef __SYNFIG_BLINEPOINT_H +#define __SYNFIG_BLINEPOINT_H /* === H E A D E R S ======================================================= */ @@ -36,7 +36,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class BLinePoint : public UniqueID { @@ -84,7 +84,7 @@ public: }; // END of class BLinePoint -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/blur.cpp b/synfig-core/trunk/src/synfig/blur.cpp index 3d22fc8..0602622 100644 --- a/synfig-core/trunk/src/synfig/blur.cpp +++ b/synfig-core/trunk/src/synfig/blur.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file blur.cpp ** \brief Blur Implementation File ** @@ -28,8 +28,8 @@ # include #endif -#include -#include +#include +#include #include "blur.h" @@ -46,7 +46,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -113,7 +113,7 @@ Point Blur::operator ()(const Point &pos) const return blurpos; } -Point Blur::operator ()(sinfg::Real x, sinfg::Real y) const +Point Blur::operator ()(synfig::Real x, synfig::Real y) const { return (*this)(Point(x,y)); } @@ -469,7 +469,7 @@ bool Blur::operator ()(const Surface &surface, Surface worksurface(w,h); - //sinfg::info("Blur: check surface = %s", surface_valid(surface)?"true":"false"); + //synfig::info("Blur: check surface = %s", surface_valid(surface)?"true":"false"); // Premultiply the alpha for(y=0;y temp %d", length); + //synfig::info("Blur: hbox blur work -> temp %d", length); etl::hbox_blur(worksurface.begin(),worksurface.end(),length,temp_surface.begin()); } else temp_surface = worksurface; - //sinfg::info("Blur: hbox finished"); + //synfig::info("Blur: hbox finished"); //vertical part //Surface temp_surface2; @@ -580,11 +580,11 @@ bool Blur::operator ()(const Surface &surface, int length = halfsizey; length = std::max(1,length); - //sinfg::info("Blur: vbox blur temp -> work %d",length); + //synfig::info("Blur: vbox blur temp -> work %d",length); etl::vbox_blur(temp_surface.begin(),temp_surface.end(),length,worksurface.begin()); } else worksurface = temp_surface; - //sinfg::info("Blur: vbox finished"); + //synfig::info("Blur: vbox finished"); //blend with the original surface /*int x,y; @@ -702,7 +702,7 @@ bool Blur::operator ()(const Surface &surface, Surface temp_surface; Surface *gauss_surface; - //sinfg::warning("Didn't crash yet b1"); + //synfig::warning("Didn't crash yet b1"); //if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT) gauss_surface = &worksurface; @@ -736,7 +736,7 @@ bool Blur::operator ()(const Surface &surface, memset(SC0,0,(w+2)*sizeof(Color)); memset(SC0,0,(w+2)*sizeof(Color)); - //sinfg::warning("Didn't crash yet b2"); + //synfig::warning("Didn't crash yet b2"); //int i = 0; while(bw&&bh) @@ -761,7 +761,7 @@ bool Blur::operator ()(const Surface &surface, bw--,bh--; } - //sinfg::warning("Didn't crash yet bi - %d",i++); + //synfig::warning("Didn't crash yet bi - %d",i++); } while(bw) { @@ -777,7 +777,7 @@ bool Blur::operator ()(const Surface &surface, GuassianBlur_2x1(*gauss_surface); bw--; } - //sinfg::warning("Didn't crash yet bi - %d",i++); + //synfig::warning("Didn't crash yet bi - %d",i++); } while(bh) { @@ -793,7 +793,7 @@ bool Blur::operator ()(const Surface &surface, GuassianBlur_1x2(*gauss_surface); bh--; } - //sinfg::warning("Didn't crash yet bi - %d",i++); + //synfig::warning("Didn't crash yet bi - %d",i++); } delete [] SC0; @@ -808,7 +808,7 @@ bool Blur::operator ()(const Surface &surface, for(x=0;x -#include -#include +#include +#include +#include /* === M A C R O S ========================================================= */ /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ -class sinfg::ProgressCallback; +class synfig::ProgressCallback; class Blur { @@ -51,35 +51,35 @@ public: }; private: - sinfg::Point size; + synfig::Point size; int type; - sinfg::ProgressCallback *cb; + synfig::ProgressCallback *cb; public: - sinfg::Point & set_size(const sinfg::Point &v) { return (size = v); } - const sinfg::Point & get_size() const { return size; } - sinfg::Point & get_size() { return size; } + synfig::Point & set_size(const synfig::Point &v) { return (size = v); } + const synfig::Point & get_size() const { return size; } + synfig::Point & get_size() { return size; } int & set_type(const int &t) { return (type = t); } const int & get_type() const { return type; } int & get_type() { return type; } Blur() {} - Blur(const sinfg::Point &s, int t, sinfg::ProgressCallback *callb=0):size(s), type(t), cb(callb) {} - Blur(sinfg::Real sx, sinfg::Real sy, int t, sinfg::ProgressCallback *callb = 0): size(sx,sy), type(t), cb(callb) {} + Blur(const synfig::Point &s, int t, synfig::ProgressCallback *callb=0):size(s), type(t), cb(callb) {} + Blur(synfig::Real sx, synfig::Real sy, int t, synfig::ProgressCallback *callb = 0): size(sx,sy), type(t), cb(callb) {} //Parametric Blur - sinfg::Point operator ()(const sinfg::Point &p) const; - sinfg::Point operator ()(sinfg::Real x, sinfg::Real y) const; + synfig::Point operator ()(const synfig::Point &p) const; + synfig::Point operator ()(synfig::Real x, synfig::Real y) const; //Surface based blur // input surface can be the same as output surface, // though both have to be the same size - bool operator ()(const sinfg::Surface &surface, const sinfg::Vector &resolution, sinfg::Surface &out) const; + bool operator ()(const synfig::Surface &surface, const synfig::Vector &resolution, synfig::Surface &out) const; - bool operator ()(const etl::surface &surface, const sinfg::Vector &resolution, etl::surface &out) const; - //bool operator ()(const etl::surface &surface, const sinfg::Vector &resolution, etl::surface &out) const; + bool operator ()(const etl::surface &surface, const synfig::Vector &resolution, etl::surface &out) const; + //bool operator ()(const etl::surface &surface, const synfig::Vector &resolution, etl::surface &out) const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp index 3d3e87a..df200ba 100644 --- a/synfig-core/trunk/src/synfig/canvas.cpp +++ b/synfig-core/trunk/src/synfig/canvas.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvas.cpp ** \brief Canvas Class Member Definitions ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -41,11 +41,11 @@ #endif -using namespace sinfg; +using namespace synfig; using namespace etl; using namespace std; -namespace sinfg { extern Canvas::Handle open_canvas(const String &filename); }; +namespace synfig { extern Canvas::Handle open_canvas(const String &filename); }; /* === M A C R O S ========================================================= */ @@ -55,7 +55,7 @@ struct _CanvasCounter ~_CanvasCounter() { if(counter) - sinfg::error("%d canvases not yet deleted!",counter); + synfig::error("%d canvases not yet deleted!",counter); } } _canvas_counter; @@ -130,10 +130,10 @@ Canvas::clear() while(!empty()) { Layer::Handle layer(front()); - //if(layer->count()>2)sinfg::info("before layer->count()=%d",layer->count()); + //if(layer->count()>2)synfig::info("before layer->count()=%d",layer->count()); erase(begin()); - //if(layer->count()>1)sinfg::info("after layer->count()=%d",layer->count()); + //if(layer->count()>1)synfig::info("after layer->count()=%d",layer->count()); } //CanvasBase::clear(); @@ -261,9 +261,9 @@ Canvas::set_time(Time t)const #if 0 if(is_root()) { - sinfg::info("is_dirty_=%d",is_dirty_); - sinfg::info("get_time()=%f",(float)get_time()); - sinfg::info("t=%f",(float)t); + synfig::info("is_dirty_=%d",is_dirty_); + synfig::info("get_time()=%f",(float)get_time()); + synfig::info("t=%f",(float)t); } #endif @@ -279,7 +279,7 @@ Canvas::set_time(Time t)const Canvas::LooseHandle Canvas::get_root()const { - return parent_?parent_->get_root().get():const_cast(this); + return parent_?parent_->get_root().get():const_cast(this); } int @@ -375,8 +375,8 @@ Canvas::find_value_node(const String &id)const String value_node_id(id,id.rfind(':')+1); if(canvas_id.empty()) canvas_id=':'; - //sinfg::warning("constfind:value_node_id: "+value_node_id); - //sinfg::warning("constfind:canvas_id: "+canvas_id); + //synfig::warning("constfind:value_node_id: "+value_node_id); + //synfig::warning("constfind:canvas_id: "+canvas_id); return find_canvas(canvas_id)->value_node_list_.find(value_node_id); } @@ -438,7 +438,7 @@ Canvas::add_value_node(ValueNode::Handle x, const String &id) if(!value_node_list_.add(x)) { - sinfg::error("Unable to add ValueNode"); + synfig::error("Unable to add ValueNode"); throw std::runtime_error("Unable to add ValueNode"); } //DEBUGPOINT(); @@ -546,7 +546,7 @@ Canvas::surefind_canvas(const String &id) return *iter; // Create a new canvas and return it - //sinfg::warning("Implicitly creating canvas named "+id); + //synfig::warning("Implicitly creating canvas named "+id); return new_child_canvas(id); } @@ -660,7 +660,7 @@ Canvas::push_back(etl::handle x) // DEBUGPOINT(); // int i(x->count()); insert(end(),x); - //if(x->count()!=i+1)sinfg::info("push_back before %d, after %d",i,x->count()); + //if(x->count()!=i+1)synfig::info("push_back before %d, after %d",i,x->count()); } void @@ -669,7 +669,7 @@ Canvas::push_front(etl::handle x) // DEBUGPOINT(); // int i(x->count()); insert(begin(),x); - //if(x->count()!=i+1)sinfg::error("push_front before %d, after %d",i,x->count()); + //if(x->count()!=i+1)synfig::error("push_front before %d, after %d",i,x->count()); } void @@ -680,7 +680,7 @@ Canvas::insert(iterator iter,etl::handle x) /*if(x->count()!=i+1) { - sinfg::error(__FILE__":%d: Canvas::insert(): ***FAILURE*** before %d, after %d",__LINE__,i,x->count()); + synfig::error(__FILE__":%d: Canvas::insert(): ***FAILURE*** before %d, after %d",__LINE__,i,x->count()); return; //throw runtime_error("Canvas Insertion Failed"); }*/ @@ -756,7 +756,7 @@ Canvas::erase(Canvas::iterator iter) Canvas::Handle Canvas::clone(const GUID& deriv_guid)const { - sinfg::String name; + synfig::String name; if(is_inline()) name="inline"; else @@ -788,17 +788,17 @@ Canvas::clone(const GUID& deriv_guid)const canvas->push_back(layer); if(!(layer.count()>1)) { - sinfg::error("Canvas::clone(): Cloned layer insertion failure!"); - sinfg::error("Canvas::clone(): \tlayer.count()=%d",layer.count()); - sinfg::error("Canvas::clone(): \tlayer->get_name()=%s",layer->get_name().c_str()); - sinfg::error("Canvas::clone(): \tbefore size()=%d",presize); - sinfg::error("Canvas::clone(): \tafter size()=%d",size()); + synfig::error("Canvas::clone(): Cloned layer insertion failure!"); + synfig::error("Canvas::clone(): \tlayer.count()=%d",layer.count()); + synfig::error("Canvas::clone(): \tlayer->get_name()=%s",layer->get_name().c_str()); + synfig::error("Canvas::clone(): \tbefore size()=%d",presize); + synfig::error("Canvas::clone(): \tafter size()=%d",size()); } assert(layer.count()>1); } else { - sinfg::error("Unable to clone layer"); + synfig::error("Unable to clone layer"); } } @@ -881,7 +881,7 @@ Canvas::new_child_canvas(const String &id) } Canvas::Handle -Canvas::add_child_canvas(Canvas::Handle child_canvas, const sinfg::String& id) +Canvas::add_child_canvas(Canvas::Handle child_canvas, const synfig::String& id) { if(is_inline() && parent_) return parent_->add_child_canvas(child_canvas,id); @@ -1008,7 +1008,7 @@ Canvas::get_meta_data_keys()const } void -sinfg::optimize_layers(Context context, Canvas::Handle op_canvas) +synfig::optimize_layers(Context context, Canvas::Handle op_canvas) { Context iter; @@ -1035,9 +1035,9 @@ sinfg::optimize_layers(Context context, Canvas::Handle op_canvas) { Canvas::Handle sub_canvas(Canvas::create_inline(op_canvas)); optimize_layers(paste_canvas->get_sub_canvas()->get_context(),sub_canvas); -//#define SINFG_OPTIMIZE_PASTE_CANVAS 1 +//#define SYNFIG_OPTIMIZE_PASTE_CANVAS 1 -#ifdef SINFG_OPTIMIZE_PASTE_CANVAS +#ifdef SYNFIG_OPTIMIZE_PASTE_CANVAS Canvas::iterator sub_iter; // Determine if we can just remove the paste canvas // altogether diff --git a/synfig-core/trunk/src/synfig/canvas.h b/synfig-core/trunk/src/synfig/canvas.h index 8bd540e..c6ff79b 100644 --- a/synfig-core/trunk/src/synfig/canvas.h +++ b/synfig-core/trunk/src/synfig/canvas.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvas.h ** \brief Canvas Class Implementation ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CANVAS_H -#define __SINFG_CANVAS_H +#ifndef __SYNFIG_CANVAS_H +#define __SYNFIG_CANVAS_H /* === H E A D E R S ======================================================= */ @@ -46,7 +46,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Context; class GUID; @@ -67,7 +67,7 @@ public: typedef std::list Children; - friend void sinfg::optimize_layers(Context, Canvas::Handle); + friend void synfig::optimize_layers(Context, Canvas::Handle); /* -- ** -- D A T A ------------------------------------------------------------- @@ -155,8 +155,8 @@ private: //! Group Changed sigc::signal signal_group_changed_; - sigc::signal > signal_group_pair_added_; - sigc::signal > signal_group_pair_removed_; + sigc::signal > signal_group_pair_added_; + sigc::signal > signal_group_pair_removed_; //! Layers Reordered sigc::signal signal_layers_reordered_; @@ -193,8 +193,8 @@ private: public: - sigc::signal >& signal_group_pair_added() { return signal_group_pair_added_; } - sigc::signal >& signal_group_pair_removed() { return signal_group_pair_removed_; } + sigc::signal >& signal_group_pair_added() { return signal_group_pair_added_; } + sigc::signal >& signal_group_pair_removed() { return signal_group_pair_removed_; } //! Group Added sigc::signal& signal_group_added() { return signal_group_added_; } @@ -477,7 +477,7 @@ protected: void optimize_layers(Context context, Canvas::Handle op_canvas); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/canvasbase.h b/synfig-core/trunk/src/synfig/canvasbase.h index 3fc5225..eed34d4 100644 --- a/synfig-core/trunk/src/synfig/canvasbase.h +++ b/synfig-core/trunk/src/synfig/canvasbase.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvasbase.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CANVASBASE_H -#define __SINFG_CANVASBASE_H +#ifndef __SYNFIG_CANVASBASE_H +#define __SYNFIG_CANVASBASE_H /* === H E A D E R S ======================================================= */ @@ -33,13 +33,13 @@ /* === T Y P E D E F S ===================================================== */ -namespace sinfg { +namespace synfig { class Layer; typedef std::deque< etl::handle< Layer > > CanvasBase; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/color.cpp b/synfig-core/trunk/src/synfig/color.cpp index 584bdd5..2799fc1 100644 --- a/synfig-core/trunk/src/synfig/color.cpp +++ b/synfig-core/trunk/src/synfig/color.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file color.h ** \brief Color Class ** @@ -34,7 +34,7 @@ #endif -using namespace sinfg; +using namespace synfig; using namespace etl; using namespace std; diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h index 849acd7..868420b 100644 --- a/synfig-core/trunk/src/synfig/color.h +++ b/synfig-core/trunk/src/synfig/color.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file color.h ** \brief Color Class Implementation ** @@ -21,12 +21,12 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_COLOR_H -#define __SINFG_COLOR_H +#ifndef __SYNFIG_COLOR_H +#define __SYNFIG_COLOR_H /* === H E A D E R S ======================================================= */ -#ifndef SINFG_NO_ANGLE +#ifndef SYNFIG_NO_ANGLE # include "angle.h" #endif @@ -58,7 +58,7 @@ extern "C" { int _isnan(double x); } #endif -namespace sinfg { +namespace synfig { #ifdef USE_HALF_TYPE typedef half ColorReal; @@ -357,7 +357,7 @@ public: static Color YUV(const float& y, const float& u, const float& v, const value_type& a=1) { return Color().set_yuv(y,u,v).set_a(a); } -#ifndef SINFG_NO_ANGLE +#ifndef SYNFIG_NO_ANGLE //! Returns the hue of the chromanance /*! This is the angle of the U and V components. ** \see set_hue() */ @@ -854,7 +854,7 @@ PixelFormat2Color(Color &color, const PixelFormat &pf,const unsigned char *out) -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/context.cpp b/synfig-core/trunk/src/synfig/context.cpp index 617238d..568bc6d 100644 --- a/synfig-core/trunk/src/synfig/context.cpp +++ b/synfig-core/trunk/src/synfig/context.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.cpp ** \brief Template File ** @@ -43,16 +43,16 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ -//#define SINFG_PROFILE_LAYERS -//#define SINFG_DEBUG_LAYERS +//#define SYNFIG_PROFILE_LAYERS +//#define SYNFIG_DEBUG_LAYERS /* === G L O B A L S ======================================================= */ -#ifdef SINFG_PROFILE_LAYERS +#ifdef SYNFIG_PROFILE_LAYERS #include static int depth(0); static std::map time_table; @@ -62,7 +62,7 @@ static String curr_layer; static void _print_profile_report() { - sinfg::info(">>>> Profile Report: (Times are in msecs)"); + synfig::info(">>>> Profile Report: (Times are in msecs)"); std::map::iterator iter; float total_time(0); for(iter=time_table.begin();iter!=time_table.end();++iter) @@ -71,10 +71,10 @@ _print_profile_report() float time(iter->second); int runs(run_table[layer]); total_time+=time; - sinfg::info(" Layer \"%s\",\tExecs: %03d, Avg Time: %05.1f, Total Time: %05.1f",layer.c_str(),runs,time/runs*1000,time*1000); + synfig::info(" Layer \"%s\",\tExecs: %03d, Avg Time: %05.1f, Total Time: %05.1f",layer.c_str(),runs,time/runs*1000,time*1000); } - sinfg::info("Total Time: %f seconds", total_time); - sinfg::info("<<<< End of Profile Report"); + synfig::info("Total Time: %f seconds", total_time); + synfig::info("<<<< End of Profile Report"); } #endif @@ -164,7 +164,7 @@ Context::get_full_bounding_rect()const bool Context::accelerated_render(Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb) const { - #ifdef SINFG_PROFILE_LAYERS + #ifdef SYNFIG_PROFILE_LAYERS String layer_name(curr_layer); //sum the pre-work done by layer above us... (curr_layer is layer above us...) @@ -205,25 +205,25 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde // If this layer isn't defined, return alpha if((context)->empty()) { -#ifdef SINFG_DEBUG_LAYERS - sinfg::info("Context::accelerated_render(): Hit end of list"); +#ifdef SYNFIG_DEBUG_LAYERS + synfig::info("Context::accelerated_render(): Hit end of list"); #endif surface->set_wh(renddesc.get_w(),renddesc.get_h()); surface->clear(); - #ifdef SINFG_PROFILE_LAYERS + #ifdef SYNFIG_PROFILE_LAYERS profile_timer.reset(); #endif return true; } -#ifdef SINFG_DEBUG_LAYERS - sinfg::info("Context::accelerated_render(): Descending into %s",(*context)->get_name().c_str()); +#ifdef SYNFIG_DEBUG_LAYERS + synfig::info("Context::accelerated_render(): Descending into %s",(*context)->get_name().c_str()); #endif try { RWLock::ReaderLock lock((*context)->get_rw_lock()); - #ifdef SINFG_PROFILE_LAYERS + #ifdef SYNFIG_PROFILE_LAYERS //go down one layer :P depth++; @@ -250,7 +250,7 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde } catch(std::bad_alloc) { - sinfg::error("Context::accelerated_render(): Layer \"%s\" threw a bad_alloc exception!",(*context)->get_name().c_str()); + synfig::error("Context::accelerated_render(): Layer \"%s\" threw a bad_alloc exception!",(*context)->get_name().c_str()); #ifdef _DEBUG return false; #else @@ -260,7 +260,7 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde } catch(...) { - sinfg::error("Context::accelerated_render(): Layer \"%s\" threw an exception, rethrowing...",(*context)->get_name().c_str()); + synfig::error("Context::accelerated_render(): Layer \"%s\" threw an exception, rethrowing...",(*context)->get_name().c_str()); throw; } } @@ -288,8 +288,8 @@ Context::set_time(Time time)const // Set up a wrter lock RWLock::WriterLock lock((*context)->get_rw_lock()); - //sinfg::info("%s: dirty_time=%f",(*context)->get_name().c_str(),(float)(*context)->dirty_time_); - //sinfg::info("%s: time=%f",(*context)->get_name().c_str(),(float)time); + //synfig::info("%s: dirty_time=%f",(*context)->get_name().c_str(),(float)(*context)->dirty_time_); + //synfig::info("%s: time=%f",(*context)->get_name().c_str(),(float)time); { Layer::ParamList params; diff --git a/synfig-core/trunk/src/synfig/context.h b/synfig-core/trunk/src/synfig/context.h index a3a6c3f..001c6da 100644 --- a/synfig-core/trunk/src/synfig/context.h +++ b/synfig-core/trunk/src/synfig/context.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file context.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CONTEXT_H -#define __SINFG_CONTEXT_H +#ifndef __SYNFIG_CONTEXT_H +#define __SYNFIG_CONTEXT_H /* === H E A D E R S ======================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Vector; typedef Vector Point; @@ -79,7 +79,7 @@ public: }; // END of class Context -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/curve_helper.cpp b/synfig-core/trunk/src/synfig/curve_helper.cpp index 62023f8..b613b19 100644 --- a/synfig-core/trunk/src/synfig/curve_helper.cpp +++ b/synfig-core/trunk/src/synfig/curve_helper.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file curve_helper.cpp ** \brief Curve Helper File ** @@ -39,7 +39,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ #define ERR 1e-11 @@ -53,7 +53,7 @@ const Real ERROR = 1e-11; /* === E N T R Y P O I N T ================================================= */ -Real sinfg::find_closest(const etl::bezier &curve, const Point &point, +Real synfig::find_closest(const etl::bezier &curve, const Point &point, float step, Real *dout, float *tout) { #if 0 @@ -261,7 +261,7 @@ void BezHull::Bound(const etl::bezier &b) //Line Intersection int -sinfg::intersect(const Point &p1, const Vector &v1, float &t1, +synfig::intersect(const Point &p1, const Vector &v1, float &t1, const Point &p2, const Vector &v2, float &t2) { /* Parametric intersection: @@ -341,7 +341,7 @@ int intersect(const Rect &r, const Point &p, const Vector &v) return (int)(t[0] <= t[3] && t[1] >= t[2]); } -int sinfg::intersect(const Rect &r, const Point &p) +int synfig::intersect(const Rect &r, const Point &p) { return (p[1] < r.maxy && p[1] > r.miny) && p[0] > r.minx; } @@ -695,7 +695,7 @@ int intersect_scurve(const CIntersect::SCurve &b, const Point &p) return intersect_scurve(l,p) + intersect_scurve(r,p); } -int sinfg::intersect(const bezier &b, const Point &p) +int synfig::intersect(const bezier &b, const Point &p) { CIntersect::SCurve c(b,0,1); diff --git a/synfig-core/trunk/src/synfig/curve_helper.h b/synfig-core/trunk/src/synfig/curve_helper.h index 3c4bd68..8edfae3 100644 --- a/synfig-core/trunk/src/synfig/curve_helper.h +++ b/synfig-core/trunk/src/synfig/curve_helper.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file curve_helper.h ** \brief Curve Helper Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CURVE_HELPER_H -#define __SINFG_CURVE_HELPER_H +#ifndef __SYNFIG_CURVE_HELPER_H +#define __SYNFIG_CURVE_HELPER_H /* === H E A D E R S ======================================================= */ #include @@ -39,7 +39,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { //line helper functions inline Real line_point_distsq(const Point &p1, const Point &p2, diff --git a/synfig-core/trunk/src/synfig/curveset.cpp b/synfig-core/trunk/src/synfig/curveset.cpp index 1ff5455..9cf6c05 100644 --- a/synfig-core/trunk/src/synfig/curveset.cpp +++ b/synfig-core/trunk/src/synfig/curveset.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file curveset.cpp ** \brief Curve Set Implementation File ** @@ -42,7 +42,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -474,7 +474,7 @@ int CurveSet::intersect(const Point &p) const b[0] = curve[j].p; b[3] = curve[i].p; b[1] = b[0] + curve[j].r/3; b[2] = b[3] - curve[i].l/3; - inter += sinfg::intersect(b,p); + inter += synfig::intersect(b,p); } } diff --git a/synfig-core/trunk/src/synfig/curveset.h b/synfig-core/trunk/src/synfig/curveset.h index 963fd93..a11535d 100644 --- a/synfig-core/trunk/src/synfig/curveset.h +++ b/synfig-core/trunk/src/synfig/curveset.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file curveset.h ** \brief Curve Set Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_CURVESET_H -#define __SINFG_CURVESET_H +#ifndef __SYNFIG_CURVESET_H +#define __SYNFIG_CURVESET_H /* === H E A D E R S ======================================================= */ #include "blinepoint.h" @@ -33,7 +33,7 @@ /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg +namespace synfig { class BLinePoint; diff --git a/synfig-core/trunk/src/synfig/distance.cpp b/synfig-core/trunk/src/synfig/distance.cpp index c1a7e65..0e2d7d6 100644 --- a/synfig-core/trunk/src/synfig/distance.cpp +++ b/synfig-core/trunk/src/synfig/distance.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file distance.cpp ** \brief Template File ** @@ -38,7 +38,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -52,53 +52,53 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -Distance::Distance(const sinfg::String& str) +Distance::Distance(const synfig::String& str) { (*this)=str; /* int i(0); float val; int ret(strscanf(str,"%f%n",&val,&i)); - sinfg::info("Distance::Distance(): ret=%d, val=%f",ret,val); + synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val); if(ret<=0) { // Error - sinfg::error("Distance::Distance(): Bad value \"%s\"",str.c_str()); + synfig::error("Distance::Distance(): Bad value \"%s\"",str.c_str()); value_=0; } else value_=val; - sinfg::info("Distance::Distance(): system=\"%s\"",String(str.begin()+i,str.end()).c_str()); + synfig::info("Distance::Distance(): system=\"%s\"",String(str.begin()+i,str.end()).c_str()); system_=ident_system(String(str.begin()+i,str.end())); */ } Distance& -Distance::operator=(const sinfg::String& str) +Distance::operator=(const synfig::String& str) { int i(0); float val; int ret(strscanf(str,"%f%n",&val,&i)); - sinfg::info("Distance::Distance(): ret=%d, val=%f",ret,val); + synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val); if(ret<=0) { // Error - sinfg::error("Distance::Distance(): Bad value \"%s\"",str.c_str()); + synfig::error("Distance::Distance(): Bad value \"%s\"",str.c_str()); return *this; } else value_=val; - sinfg::String sys(str.begin()+i,str.end()); + synfig::String sys(str.begin()+i,str.end()); if(sys.size()) system_=ident_system(sys); return *this; } -sinfg::String +synfig::String Distance::get_string(int digits)const { digits=min(9,max(0,digits)); @@ -183,16 +183,16 @@ Distance::meters_to_system(Real x,System target_system) } Distance::System // (static) -Distance::ident_system(const sinfg::String& x) +Distance::ident_system(const synfig::String& x) { - sinfg::String str; + synfig::String str; // Make it all upper case, and remove white space for(unsigned int i=0;i(pow(x,gamma_b)*(1.0f-black_level)+black_level); } }; // END of class Gamma -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h index 2af68c5..1fe5851 100644 --- a/synfig-core/trunk/src/synfig/general.h +++ b/synfig-core/trunk/src/synfig/general.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file general.h ** \brief General macros, classes, and prodecure declarations ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GENERAL_H -#define __SINFG_GENERAL_H +#ifndef __SYNFIG_GENERAL_H +#define __SYNFIG_GENERAL_H /* === H E A D E R S ======================================================= */ @@ -39,16 +39,16 @@ //#define gettext(x) (x) #endif -#define SINFG_COPYRIGHT "Copyright (c) 2001-2004 Voria Software, LLC" +#define SYNFIG_COPYRIGHT "Copyright (c) 2001-2004 Voria Software, LLC" #ifdef _DEBUG #ifdef __FUNC__ -#define DEBUGPOINT() sinfg::warning(etl::strprintf(__FILE__":"__FUNC__":%d DEBUGPOINT",__LINE__)) -#define DEBUGINFO(x) sinfg::warning(etl::strprintf(__FILE__":"__FUNC__":%d:DEBUGINFO:",__LINE__)+x) +#define DEBUGPOINT() synfig::warning(etl::strprintf(__FILE__":"__FUNC__":%d DEBUGPOINT",__LINE__)) +#define DEBUGINFO(x) synfig::warning(etl::strprintf(__FILE__":"__FUNC__":%d:DEBUGINFO:",__LINE__)+x) #else -#define DEBUGPOINT() sinfg::warning(etl::strprintf(__FILE__":%d DEBUGPOINT",__LINE__)) -#define DEBUGINFO(x) sinfg::warning(etl::strprintf(__FILE__":%d:DEBUGINFO:",__LINE__)+x) +#define DEBUGPOINT() synfig::warning(etl::strprintf(__FILE__":%d DEBUGPOINT",__LINE__)) +#define DEBUGINFO(x) synfig::warning(etl::strprintf(__FILE__":%d:DEBUGINFO:",__LINE__)+x) #endif #else @@ -58,7 +58,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class ProgressCallback ** \todo writeme @@ -123,7 +123,7 @@ extern bool add_to_module_search_path(const std:string &path); extern bool add_to_config_search_path(const std:string &path); */ -//! Shutdown the sinfg environment +//! Shutdown the synfig environment extern void shutdown(); //! Reports an error @@ -141,7 +141,7 @@ extern void warning(const String &str); extern void info(const char *format,...); extern void info(const String &str); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/gradient.cpp b/synfig-core/trunk/src/synfig/gradient.cpp index 8132809..40c0d52 100644 --- a/synfig-core/trunk/src/synfig/gradient.cpp +++ b/synfig-core/trunk/src/synfig/gradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file gradient.cpp ** \brief Color Gradient Class Member Definitions ** @@ -40,7 +40,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -50,13 +50,13 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::Gradient::Gradient(const Color &c1, const Color &c2) +synfig::Gradient::Gradient(const Color &c1, const Color &c2) { push_back(CPoint(0.0,c1)); push_back(CPoint(1.0,c2)); } -sinfg::Gradient::Gradient(const Color &c1, const Color &c2, const Color &c3) +synfig::Gradient::Gradient(const Color &c1, const Color &c2, const Color &c3) { push_back(CPoint(0.0,c1)); push_back(CPoint(0.5,c2)); @@ -69,7 +69,7 @@ sinfg::Gradient::Gradient(const Color &c1, const Color &c2, const Color &c3) // This algorithm will sort a nearly-sorted list at ~O(N), and // it will sort an inverse sorted list at ~O(N*N). void -sinfg::Gradient::sort() +synfig::Gradient::sort() { stable_sort(begin(),end()); /* @@ -95,8 +95,8 @@ sinfg::Gradient::sort() */ } -static sinfg::ColorAccumulator -supersample_helper(const sinfg::Gradient::CPoint &color1, const sinfg::Gradient::CPoint &color2, float begin, float end, float &weight) +static synfig::ColorAccumulator +supersample_helper(const synfig::Gradient::CPoint &color1, const synfig::Gradient::CPoint &color2, float begin, float end, float &weight) { if(color1.pos==color2.pos || color1.pos>=end || color2.pos<=begin) { @@ -136,10 +136,10 @@ supersample_helper(const sinfg::Gradient::CPoint &color1, const sinfg::Gradient: ret.set_b(ret.get_b()*ret.get_a()); return ret*weight; } - sinfg::error("color1.pos=%f",color1.pos); - sinfg::error("color2.pos=%f",color2.pos); - sinfg::error("begin=%f",begin); - sinfg::error("end=%f",end); + synfig::error("color1.pos=%f",color1.pos); + synfig::error("color2.pos=%f",color2.pos); + synfig::error("begin=%f",begin); + synfig::error("end=%f",end); weight=0; return Color::alpha(); @@ -148,7 +148,7 @@ supersample_helper(const sinfg::Gradient::CPoint &color1, const sinfg::Gradient: } Color -sinfg::Gradient::operator()(const Real &x,float supersample)const +synfig::Gradient::operator()(const Real &x,float supersample)const { if(empty()) return Color(0,0,0,0); @@ -345,13 +345,13 @@ sinfg::Gradient::operator()(const Real &x,float supersample)const // We should never get to this point. - sinfg::error("sinfg::Gradient::operator()(): Logic Error (x=%f)",x); + synfig::error("synfig::Gradient::operator()(): Logic Error (x=%f)",x); assert(0); - throw std::logic_error(strprintf("sinfg::Gradient::operator()(): Logic Error (x=%f)",x)); + throw std::logic_error(strprintf("synfig::Gradient::operator()(): Logic Error (x=%f)",x)); } -sinfg::Gradient::iterator -sinfg::Gradient::proximity(const Real &x) +synfig::Gradient::iterator +synfig::Gradient::proximity(const Real &x) { iterator iter; float dist(100000000); @@ -378,8 +378,8 @@ sinfg::Gradient::proximity(const Real &x) return iter; } -sinfg::Gradient::const_iterator -sinfg::Gradient::proximity(const Real &x)const +synfig::Gradient::const_iterator +synfig::Gradient::proximity(const Real &x)const { return const_cast(this)->proximity(x); /* @@ -402,8 +402,8 @@ sinfg::Gradient::proximity(const Real &x)const */ } -sinfg::Gradient::iterator -sinfg::Gradient::find(const UniqueID &id) +synfig::Gradient::iterator +synfig::Gradient::find(const UniqueID &id) { iterator iter; @@ -413,11 +413,11 @@ sinfg::Gradient::find(const UniqueID &id) return iter; } - throw Exception::NotFound("sinfg::Gradient::find(): Unable to find UniqueID in gradient"); + throw Exception::NotFound("synfig::Gradient::find(): Unable to find UniqueID in gradient"); } -sinfg::Gradient::const_iterator -sinfg::Gradient::find(const UniqueID &id)const +synfig::Gradient::const_iterator +synfig::Gradient::find(const UniqueID &id)const { const_iterator iter; @@ -427,5 +427,5 @@ sinfg::Gradient::find(const UniqueID &id)const return iter; } - throw Exception::NotFound("sinfg::Gradient::find()const: Unable to find UniqueID in gradient"); + throw Exception::NotFound("synfig::Gradient::find()const: Unable to find UniqueID in gradient"); } diff --git a/synfig-core/trunk/src/synfig/gradient.h b/synfig-core/trunk/src/synfig/gradient.h index 6bfe0a1..25b8984 100644 --- a/synfig-core/trunk/src/synfig/gradient.h +++ b/synfig-core/trunk/src/synfig/gradient.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file gradient.h ** \brief Color Gradient Class ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GRADIENT_H -#define __SINFG_GRADIENT_H +#ifndef __SYNFIG_GRADIENT_H +#define __SYNFIG_GRADIENT_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \struct GradientCPoint ** \brief \todo @@ -95,7 +95,7 @@ public: const_iterator find(const UniqueID &id)const; }; // END of class Gradient -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/guid.cpp b/synfig-core/trunk/src/synfig/guid.cpp index 0c94eb5..7740c54 100644 --- a/synfig-core/trunk/src/synfig/guid.cpp +++ b/synfig-core/trunk/src/synfig/guid.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file guid.cpp ** \brief Template File ** @@ -63,7 +63,7 @@ using namespace __gnu_cxx; using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -133,7 +133,7 @@ static void (*get_rand_long_long)(uint64_t&)=_set_up_rand_long_long; static void _set_up_rand_long_long(uint64_t &x) { #ifdef _DEBUG - sinfg::info("Starting up GUID system..."); + synfig::info("Starting up GUID system..."); #endif _a=GUID_RNG(time(0)+clock()); _b=GUID_RNG(clock()); @@ -171,7 +171,7 @@ static void (*get_rand_long_long)(uint64_t&)=_set_up_rand_long_long; static void _set_up_rand_long_long(uint64_t &x) { #ifdef _DEBUG - sinfg::info("Starting up GUID system..."); + synfig::info("Starting up GUID system..."); #endif rand_fd=open("/dev/urandom",O_RDONLY); get_rand_long_long=_get_rand_long_long; @@ -186,14 +186,14 @@ static void _get_rand_long_long(uint64_t &x){ read(rand_fd,&x,sizeof(x));} void -sinfg::GUID::make_unique() +synfig::GUID::make_unique() { get_rand_long_long(data.u_64.a); get_rand_long_long(data.u_64.b); } -sinfg::GUID -sinfg::GUID::hasher(const String& str) +synfig::GUID +synfig::GUID::hasher(const String& str) { #ifdef HASH_MAP_H hash string_hash_; @@ -220,8 +220,8 @@ sinfg::GUID::hasher(const String& str) return ret; } -sinfg::GUID -sinfg::GUID::hasher(int i) +synfig::GUID +synfig::GUID::hasher(int i) { GUID ret(0); GUID_RNG random(i); @@ -233,12 +233,12 @@ sinfg::GUID::hasher(int i) } String -sinfg::GUID::get_string()const +synfig::GUID::get_string()const { return strprintf("%08X%08X%08X%08X",data.u_32.a,data.u_32.b,data.u_32.c,data.u_32.d); } -sinfg::GUID::GUID(const String &str) +synfig::GUID::GUID(const String &str) { strscanf(str,"%08X%08X%08X%08X",&data.u_32.a,&data.u_32.b,&data.u_32.c,&data.u_32.d); } diff --git a/synfig-core/trunk/src/synfig/guid.h b/synfig-core/trunk/src/synfig/guid.h index 791f29f..af62627 100644 --- a/synfig-core/trunk/src/synfig/guid.h +++ b/synfig-core/trunk/src/synfig/guid.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file guid.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GUID_H -#define __SINFG_GUID_H +#ifndef __SYNFIG_GUID_H +#define __SYNFIG_GUID_H /* === H E A D E R S ======================================================= */ @@ -36,7 +36,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class GUID { diff --git a/synfig-core/trunk/src/synfig/guidset.h b/synfig-core/trunk/src/synfig/guidset.h index 7ca424c..2aa0d7f 100644 --- a/synfig-core/trunk/src/synfig/guidset.h +++ b/synfig-core/trunk/src/synfig/guidset.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file guidset.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GUIDSET_H -#define __SINFG_GUIDSET_H +#ifndef __SYNFIG_GUIDSET_H +#define __SYNFIG_GUIDSET_H #define HASH_SET_H @@ -42,13 +42,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class GUIDSet : public #ifdef HASH_SET_H -std::set +std::set #else -std::hash_set +std::hash_set #endif { }; // END of class GUIDSet diff --git a/synfig-core/trunk/src/synfig/importer.cpp b/synfig-core/trunk/src/synfig/importer.cpp index 6fb66cb..787c1ea 100644 --- a/synfig-core/trunk/src/synfig/importer.cpp +++ b/synfig-core/trunk/src/synfig/importer.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file importer.cpp ** \brief writeme ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -47,9 +47,9 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; -Importer::Book* sinfg::Importer::book_; +Importer::Book* synfig::Importer::book_; map *__open_importers; @@ -84,7 +84,7 @@ Importer::open(const String &filename) { if(filename.empty()) { - sinfg::error(_("Importer::open(): Cannot open empty filename")); + synfig::error(_("Importer::open(): Cannot open empty filename")); return 0; } @@ -92,13 +92,13 @@ Importer::open(const String &filename) // then use it instead. if(__open_importers->count(filename)) { - //sinfg::info("Found importer already open, using it..."); + //synfig::info("Found importer already open, using it..."); return (*__open_importers)[filename]; } if(find(filename.begin(),filename.end(),'.')==filename.end()) { - sinfg::error(_("Importer::open(): Couldn't find extension")); + synfig::error(_("Importer::open(): Couldn't find extension")); return 0; } @@ -108,7 +108,7 @@ Importer::open(const String &filename) if(!Importer::book().count(ext)) { - sinfg::error(_("Importer::open(): Unknown file type -- ")+ext); + synfig::error(_("Importer::open(): Unknown file type -- ")+ext); return 0; } @@ -120,7 +120,7 @@ Importer::open(const String &filename) } catch (String str) { - sinfg::error(str); + synfig::error(str); } return 0; } diff --git a/synfig-core/trunk/src/synfig/importer.h b/synfig-core/trunk/src/synfig/importer.h index 40a5717..b084dac 100644 --- a/synfig-core/trunk/src/synfig/importer.h +++ b/synfig-core/trunk/src/synfig/importer.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file importer.h ** \brief writeme ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_IMPORTER_H -#define __SINFG_IMPORTER_H +#ifndef __SYNFIG_IMPORTER_H +#define __SYNFIG_IMPORTER_H /* === H E A D E R S ======================================================= */ @@ -39,28 +39,28 @@ /* === M A C R O S ========================================================= */ //! \writeme -#define SINFG_IMPORTER_MODULE_EXT public: static const char name__[], version__[], ext__[],cvs_id__[]; static Importer *create(const char *filename); +#define SYNFIG_IMPORTER_MODULE_EXT public: static const char name__[], version__[], ext__[],cvs_id__[]; static Importer *create(const char *filename); //! Sets the name of the importer -#define SINFG_IMPORTER_SET_NAME(class,x) const char class::name__[]=x +#define SYNFIG_IMPORTER_SET_NAME(class,x) const char class::name__[]=x //! \writeme -#define SINFG_IMPORTER_SET_EXT(class,x) const char class::ext__[]=x +#define SYNFIG_IMPORTER_SET_EXT(class,x) const char class::ext__[]=x //! Sets the version of the importer -#define SINFG_IMPORTER_SET_VERSION(class,x) const char class::version__[]=x +#define SYNFIG_IMPORTER_SET_VERSION(class,x) const char class::version__[]=x //! Sets the CVS ID of the importer -#define SINFG_IMPORTER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x +#define SYNFIG_IMPORTER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x //! \writeme -#define SINFG_IMPORTER_INIT(class) sinfg::Importer* class::create(const char *filename) { return new class(filename); } +#define SYNFIG_IMPORTER_INIT(class) synfig::Importer* class::create(const char *filename) { return new class(filename); } /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Surface; class ProgressCallback; @@ -115,7 +115,7 @@ public: static Handle open(const String &filename); }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/interpolation.h b/synfig-core/trunk/src/synfig/interpolation.h index 43db1ea..d89e721 100644 --- a/synfig-core/trunk/src/synfig/interpolation.h +++ b/synfig-core/trunk/src/synfig/interpolation.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file interpolation.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_INTERPOLATION_H -#define __SINFG_INTERPOLATION_H +#ifndef __SYNFIG_INTERPOLATION_H +#define __SYNFIG_INTERPOLATION_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { enum Interpolation { @@ -45,7 +45,7 @@ enum Interpolation INTERPOLATION_NIL }; // END enum Interpolation -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/keyframe.cpp b/synfig-core/trunk/src/synfig/keyframe.cpp index b776a3e..a0275c5 100644 --- a/synfig-core/trunk/src/synfig/keyframe.cpp +++ b/synfig-core/trunk/src/synfig/keyframe.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file keyframe.cpp ** \brief Template File ** @@ -43,7 +43,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -72,22 +72,22 @@ KeyframeList::dump()const { const_iterator iter; int i; - sinfg::info(">>>>>>>>BEGIN KEYFRAME DUMP"); + synfig::info(">>>>>>>>BEGIN KEYFRAME DUMP"); for(iter=begin(),i=0;iter!=end();++iter,i++) { - sinfg::info("#%d, time: %s, desc: %s",i,iter->get_time().get_string().c_str(),iter->get_description().c_str()); + synfig::info("#%d, time: %s, desc: %s",i,iter->get_time().get_string().c_str(),iter->get_description().c_str()); } - sinfg::info("<<<<<<< KeyframeList; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index 24597cf..7d15019 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer.cpp ** \brief Layer class implementation ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -57,7 +57,7 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ @@ -69,7 +69,7 @@ struct _LayerCounter ~_LayerCounter() { if(counter) - sinfg::error("%d layers not yet deleted!",counter); + synfig::error("%d layers not yet deleted!",counter); } } _layer_counter; @@ -94,8 +94,8 @@ Layer::subsys_init() { _layer_book=new Book(); -#define INCLUDE_LAYER(class) sinfg::Layer::book()[sinfg::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__) -#define LAYER_ALIAS(class,alias) sinfg::Layer::book()[sinfg::String(alias)]=sinfg::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__); +#define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__) +#define LAYER_ALIAS(class,alias) synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__); INCLUDE_LAYER(Layer_SolidColor); INCLUDE_LAYER(Layer_PasteCanvas); @@ -126,7 +126,7 @@ Layer::Layer(): } Layer::LooseHandle -sinfg::Layer::create(const String &name) +synfig::Layer::create(const String &name) { if(!book().count(name)) { @@ -137,7 +137,7 @@ sinfg::Layer::create(const String &name) return Layer::LooseHandle(layer); } -sinfg::Layer::~Layer() +synfig::Layer::~Layer() { _LayerCounter::counter--; while(!dynamic_param_list_.empty()) @@ -153,7 +153,7 @@ sinfg::Layer::~Layer() } void -sinfg::Layer::set_canvas(etl::loose_handle x) +synfig::Layer::set_canvas(etl::loose_handle x) { if(canvas_!=x) { @@ -167,7 +167,7 @@ sinfg::Layer::set_canvas(etl::loose_handle x) *this, &Layer::set_canvas ), - etl::loose_handle(0) + etl::loose_handle(0) ) ); } @@ -176,12 +176,12 @@ sinfg::Layer::set_canvas(etl::loose_handle x) } void -sinfg::Layer::on_canvas_set() +synfig::Layer::on_canvas_set() { } -etl::loose_handle -sinfg::Layer::get_canvas()const +etl::loose_handle +synfig::Layer::get_canvas()const { return canvas_; } @@ -191,7 +191,7 @@ Layer::get_depth()const { if(!get_canvas()) return -1; - return get_canvas()->get_depth(const_cast(this)); + return get_canvas()->get_depth(const_cast(this)); } void @@ -280,7 +280,7 @@ Layer::get_transform()const } float -Layer::get_z_depth(const sinfg::Time& t)const +Layer::get_z_depth(const synfig::Time& t)const { if(!dynamic_param_list().count("z_depth")) return z_depth_; @@ -456,8 +456,8 @@ Layer::get_color(Context context, const Point &pos)const return context.get_color(pos); } -sinfg::Layer::Handle -Layer::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Layer::hit_check(synfig::Context context, const synfig::Point &pos)const { return context.hit_check(pos); } diff --git a/synfig-core/trunk/src/synfig/layer.h b/synfig-core/trunk/src/synfig/layer.h index 923e8f3..7937c47 100644 --- a/synfig-core/trunk/src/synfig/layer.h +++ b/synfig-core/trunk/src/synfig/layer.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer.h ** \brief Layer Class Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_H -#define __SINFG_LAYER_H +#ifndef __SYNFIG_LAYER_H +#define __SYNFIG_LAYER_H /* === H E A D E R S ======================================================= */ @@ -40,25 +40,25 @@ /* === M A C R O S ========================================================= */ //! \writeme -#define SINFG_LAYER_MODULE_EXT public: static const char name__[], version__[], cvs_id__[], local_name__[], category__[]; static Layer *create(); +#define SYNFIG_LAYER_MODULE_EXT public: static const char name__[], version__[], cvs_id__[], local_name__[], category__[]; static Layer *create(); //! Sets the name of the layer -#define SINFG_LAYER_SET_NAME(class,x) const char class::name__[]=x +#define SYNFIG_LAYER_SET_NAME(class,x) const char class::name__[]=x //! Sets the local name of the layer -#define SINFG_LAYER_SET_LOCAL_NAME(class,x) const char class::local_name__[]=x; +#define SYNFIG_LAYER_SET_LOCAL_NAME(class,x) const char class::local_name__[]=x; //! Sets the categpru of the layer -#define SINFG_LAYER_SET_CATEGORY(class,x) const char class::category__[]=x +#define SYNFIG_LAYER_SET_CATEGORY(class,x) const char class::category__[]=x //! Sets the version string for the layer -#define SINFG_LAYER_SET_VERSION(class,x) const char class::version__[]=x +#define SYNFIG_LAYER_SET_VERSION(class,x) const char class::version__[]=x //! Sets the CVS ID string for the layer -#define SINFG_LAYER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x +#define SYNFIG_LAYER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x //! \writeme -#define SINFG_LAYER_INIT(class) sinfg::Layer* class::create() { return new class(); } +#define SYNFIG_LAYER_INIT(class) synfig::Layer* class::create() { return new class(); } //! \writeme #define IMPORT_PLUS(x,y) if(param==#x && value.same_as(x)) { value.put(&x);{y;}return true;} @@ -85,7 +85,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Canvas; class Vector; @@ -300,7 +300,7 @@ public: float get_z_depth()const { return z_depth_; } //! \writeme - float get_z_depth(const sinfg::Time& t)const; + float get_z_depth(const synfig::Time& t)const; //! \writeme void set_z_depth(float x) { z_depth_=x; } @@ -445,7 +445,7 @@ public: }; // END of class Layer -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/layer_bitmap.cpp b/synfig-core/trunk/src/synfig/layer_bitmap.cpp index c7eb0c2..64a353b 100644 --- a/synfig-core/trunk/src/synfig/layer_bitmap.cpp +++ b/synfig-core/trunk/src/synfig/layer_bitmap.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_bitmap.cpp ** \brief Template Header ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -51,7 +51,7 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -61,7 +61,7 @@ using namespace etl; /* === M E T H O D S ======================================================= */ -sinfg::Layer_Bitmap::Layer_Bitmap(): +synfig::Layer_Bitmap::Layer_Bitmap(): Layer_Composite (1.0,Color::BLEND_COMPOSITE), tl (-0.5,0.5), br (0.5,-0.5), @@ -72,7 +72,7 @@ sinfg::Layer_Bitmap::Layer_Bitmap(): } bool -sinfg::Layer_Bitmap::set_param(const String & param, ValueBase value) +synfig::Layer_Bitmap::set_param(const String & param, ValueBase value) { IMPORT(tl); IMPORT(br); @@ -88,7 +88,7 @@ sinfg::Layer_Bitmap::set_param(const String & param, ValueBase value) } ValueBase -sinfg::Layer_Bitmap::get_param(const String & param)const +synfig::Layer_Bitmap::get_param(const String & param)const { EXPORT(tl); EXPORT(br); @@ -140,8 +140,8 @@ Layer_Bitmap::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Layer_Bitmap::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Layer_Bitmap::hit_check(synfig::Context context, const synfig::Point &pos)const { Point surface_pos; surface_pos=pos-tl; @@ -161,7 +161,7 @@ Layer_Bitmap::hit_check(sinfg::Context context, const sinfg::Point &pos)const inline const Color& -sinfg::Layer_Bitmap::filter(const Color& c)const +synfig::Layer_Bitmap::filter(const Color& c)const { if(gamma_adjust==1.0) return c; @@ -175,7 +175,7 @@ sinfg::Layer_Bitmap::filter(const Color& c)const } Color -sinfg::Layer_Bitmap::get_color(Context context, const Point &pos)const +synfig::Layer_Bitmap::get_color(Context context, const Point &pos)const { Point surface_pos; @@ -335,7 +335,7 @@ Layer_Bitmap::accelerated_render(Context context,Surface *out_surface,int qualit //perhaps use a DDA algorithm... if faster... // will still want pixel fractions to be floating point since colors are - //sinfg::info("xstart:%d ystart:%d xend:%d yend:%d",x_start,y_start,x_end,y_end); + //synfig::info("xstart:%d ystart:%d xend:%d yend:%d",x_start,y_start,x_end,y_end); //start drawing at the start of the bitmap (either origin or corner of input...) //and get other info @@ -353,7 +353,7 @@ Layer_Bitmap::accelerated_render(Context context,Surface *out_surface,int qualit if(indx > 1.7 || indy > 1.7) { - /*sinfg::info("Decided to downsample? ratios - (%f,%f) -> (%d,%d)", + /*synfig::info("Decided to downsample? ratios - (%f,%f) -> (%d,%d)", indx, indy, multw, multh); */ //use sample rect here... @@ -375,7 +375,7 @@ Layer_Bitmap::accelerated_render(Context context,Surface *out_surface,int qualit } //Color c = (*out_surface)[0][0]; - //sinfg::info("ValueBase of first pixel = (%f,%f,%f,%f)",c.get_r(),c.get_g(),c.get_b(),c.get_a()); + //synfig::info("ValueBase of first pixel = (%f,%f,%f,%f)",c.get_r(),c.get_g(),c.get_b(),c.get_a()); return true; } @@ -384,7 +384,7 @@ Layer_Bitmap::accelerated_render(Context context,Surface *out_surface,int qualit //perform normal interpolation if(interp==0) { - //sinfg::info("Decided to do nearest neighbor"); + //synfig::info("Decided to do nearest neighbor"); float iny, inx; int x,y; diff --git a/synfig-core/trunk/src/synfig/layer_bitmap.h b/synfig-core/trunk/src/synfig/layer_bitmap.h index cb34471..646cbda 100644 --- a/synfig-core/trunk/src/synfig/layer_bitmap.h +++ b/synfig-core/trunk/src/synfig/layer_bitmap.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_bitmap.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_BITMAP_H -#define __SINFG_LAYER_BITMAP_H +#ifndef __SYNFIG_LAYER_BITMAP_H +#define __SYNFIG_LAYER_BITMAP_H /* === H E A D E R S ======================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Layer_Bitmap ** \todo writeme @@ -67,10 +67,10 @@ public: virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &rend_desc, ProgressCallback *callback)const; - virtual sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; }; // END of class Layer_Bitmap -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/layer_composite.cpp b/synfig-core/trunk/src/synfig/layer_composite.cpp index 038d68f..a96e72c 100644 --- a/synfig-core/trunk/src/synfig/layer_composite.cpp +++ b/synfig-core/trunk/src/synfig/layer_composite.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_composite.cpp ** \brief Template File ** @@ -48,7 +48,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -102,7 +102,7 @@ Layer_Composite::accelerated_render(Context context,Surface *surface,int quality surfacelayer->br=renddesc.get_br(); surfacelayer->set_blend_method(Color::BLEND_STRAIGHT); - image.push_front(const_cast(this)); + image.push_front(const_cast(this)); // Set up a surface target Target::Handle target(surface_target(surface)); diff --git a/synfig-core/trunk/src/synfig/layer_composite.h b/synfig-core/trunk/src/synfig/layer_composite.h index c9bc3a0..2c9853d 100644 --- a/synfig-core/trunk/src/synfig/layer_composite.h +++ b/synfig-core/trunk/src/synfig/layer_composite.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_composite.h ** \brief Composite Layer Class Implementation ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_COMPOSITE_H -#define __SINFG_LAYER_COMPOSITE_H +#ifndef __SYNFIG_LAYER_COMPOSITE_H +#define __SYNFIG_LAYER_COMPOSITE_H /* === H E A D E R S ======================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Layer_NoDeform {}; @@ -86,7 +86,7 @@ public: virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; }; // END of class Layer_Composite -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/layer_mime.cpp b/synfig-core/trunk/src/synfig/layer_mime.cpp index 5168f5f..161b262 100644 --- a/synfig-core/trunk/src/synfig/layer_mime.cpp +++ b/synfig-core/trunk/src/synfig/layer_mime.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_mime.cpp ** \brief Template File ** @@ -51,7 +51,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/layer_mime.h b/synfig-core/trunk/src/synfig/layer_mime.h index 3754061..90b8f6d 100644 --- a/synfig-core/trunk/src/synfig/layer_mime.h +++ b/synfig-core/trunk/src/synfig/layer_mime.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_mime.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_MIME_H -#define __SINFG_LAYER_MIME_H +#ifndef __SYNFIG_LAYER_MIME_H +#define __SYNFIG_LAYER_MIME_H /* === H E A D E R S ======================================================= */ @@ -36,7 +36,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Layer_Mime ** The mime layer is a layer that is used when an unknown @@ -67,7 +67,7 @@ public: }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/layer_motionblur.cpp b/synfig-core/trunk/src/synfig/layer_motionblur.cpp index 38287bb..0cf8534 100644 --- a/synfig-core/trunk/src/synfig/layer_motionblur.cpp +++ b/synfig-core/trunk/src/synfig/layer_motionblur.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_motionblur.h ** \brief Template Header ** @@ -43,18 +43,18 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace etl; using namespace std; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_MotionBlur); -SINFG_LAYER_SET_NAME(Layer_MotionBlur,"MotionBlur"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_MotionBlur,_("Motion Blur")); -SINFG_LAYER_SET_CATEGORY(Layer_MotionBlur,_("Blurs")); -SINFG_LAYER_SET_VERSION(Layer_MotionBlur,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_MotionBlur,"$Id: layer_motionblur.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_MotionBlur); +SYNFIG_LAYER_SET_NAME(Layer_MotionBlur,"MotionBlur"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_MotionBlur,_("Motion Blur")); +SYNFIG_LAYER_SET_CATEGORY(Layer_MotionBlur,_("Blurs")); +SYNFIG_LAYER_SET_VERSION(Layer_MotionBlur,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_MotionBlur,"$Id: layer_motionblur.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === M E M B E R S ======================================================= */ diff --git a/synfig-core/trunk/src/synfig/layer_motionblur.h b/synfig-core/trunk/src/synfig/layer_motionblur.h index 5799a7c..e7335fd 100644 --- a/synfig-core/trunk/src/synfig/layer_motionblur.h +++ b/synfig-core/trunk/src/synfig/layer_motionblur.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_motionblur.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_MOTIONBLUR_H__ -#define __SINFG_LAYER_MOTIONBLUR_H__ +#ifndef __SYNFIG_LAYER_MOTIONBLUR_H__ +#define __SYNFIG_LAYER_MOTIONBLUR_H__ /* === H E A D E R S ======================================================= */ @@ -31,11 +31,11 @@ /* === S T R U C T S & C L A S S E S ======================================= */ -namespace sinfg { +namespace synfig { -class Layer_MotionBlur : public sinfg::Layer_Composite +class Layer_MotionBlur : public synfig::Layer_Composite { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: @@ -47,7 +47,7 @@ public: Layer_MotionBlur(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; @@ -63,7 +63,7 @@ public: }; // END of class Layer_MotionBlur -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index e3a71f0..c19ec29 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_pastecanvas.h ** \brief Template Header ** @@ -45,14 +45,14 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ #define MAX_DEPTH 10 //#ifdef __APPLE__ -//#define SINFG_NO_CLIP +//#define SYNFIG_NO_CLIP //#endif /* === C L A S S E S ======================================================= */ @@ -67,12 +67,12 @@ public: /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_PasteCanvas); -SINFG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas")); -SINFG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default")); -SINFG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_PasteCanvas); +SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas")); +SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default")); +SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $"); /* === M E T H O D S ======================================================= */ @@ -159,7 +159,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) } void -Layer_PasteCanvas::set_sub_canvas(etl::handle x) +Layer_PasteCanvas::set_sub_canvas(etl::handle x) { if(canvas && !do_not_muck_with_time_) remove_child(canvas.get()); @@ -196,13 +196,13 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle x) void Layer_PasteCanvas::on_canvas_set() { - //sinfg::info("before count()=%d",count()); + //synfig::info("before count()=%d",count()); if(get_canvas() && canvas && canvas->is_inline() && canvas->parent()!=get_canvas()) { - //sinfg::info("during count()=%d",count()); + //synfig::info("during count()=%d",count()); canvas->set_inline(get_canvas()); } - //sinfg::info("after count()=%d",count()); + //synfig::info("after count()=%d",count()); } ValueBase @@ -237,8 +237,8 @@ Layer_PasteCanvas::set_time(Context context, Time time)const bounds=Rect::zero(); } -sinfg::Layer::Handle -Layer_PasteCanvas::hit_check(sinfg::Context context, const sinfg::Point &pos)const +synfig::Layer::Handle +Layer_PasteCanvas::hit_check(synfig::Context context, const synfig::Point &pos)const { if(depth==MAX_DEPTH)return 0;depth_counter counter(depth); @@ -332,9 +332,9 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali blend_method=Color::BLEND_STRAIGHT; } -#ifndef SINFG_NO_CLIP +#ifndef SYNFIG_NO_CLIP { - //sinfg::info("PasteCanv Clip"); + //synfig::info("PasteCanv Clip"); Rect area(desc.get_rect()&full_bounding_rect); Point min(area.get_min()); diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.h b/synfig-core/trunk/src/synfig/layer_pastecanvas.h index 652bf7a..dc36786 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.h +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_pastecanvas.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_PASTEIMAGE_H -#define __SINFG_LAYER_PASTEIMAGE_H +#ifndef __SYNFIG_LAYER_PASTEIMAGE_H +#define __SYNFIG_LAYER_PASTEIMAGE_H /* === H E A D E R S ======================================================= */ @@ -41,16 +41,16 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Layer_PasteCanvas : public Layer_Composite, public Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: Vector origin; - etl::loose_handle canvas; + etl::loose_handle canvas; //! Recursion depth counter mutable int depth; @@ -61,7 +61,7 @@ private: mutable Time curr_time; - bool optimize_layers(sinfg::Context context,sinfg::CanvasBase&)const; + bool optimize_layers(synfig::Context context,synfig::CanvasBase&)const; bool do_not_muck_with_time_; @@ -76,8 +76,8 @@ public: void set_do_not_muck_with_time(bool x=true) { do_not_muck_with_time_=true; } - etl::handle get_sub_canvas()const { return canvas; } - void set_sub_canvas(etl::handle x); + etl::handle get_sub_canvas()const { return canvas; } + void set_sub_canvas(etl::handle x); Real get_zoom()const { return zoom; } @@ -90,7 +90,7 @@ public: virtual String get_local_name()const; - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; @@ -102,16 +102,16 @@ public: virtual Vocab get_param_vocab()const; - virtual sinfg::Rect get_bounding_rect()const; + virtual synfig::Rect get_bounding_rect()const; - virtual sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; protected: virtual void get_times_vfunc(Node::time_set &set) const; }; // END of class Layer_PasteCanvas -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/layer_polygon.cpp b/synfig-core/trunk/src/synfig/layer_polygon.cpp index 7cd2e2c..8434216 100644 --- a/synfig-core/trunk/src/synfig/layer_polygon.cpp +++ b/synfig-core/trunk/src/synfig/layer_polygon.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_polygon.cpp ** \brief Template Header ** @@ -47,18 +47,18 @@ using std::deque; /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_Polygon); -SINFG_LAYER_SET_NAME(Layer_Polygon,"polygon"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_Polygon,_("Polygon")); -SINFG_LAYER_SET_CATEGORY(Layer_Polygon,_("Geometry")); -SINFG_LAYER_SET_VERSION(Layer_Polygon,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_Polygon,"$Id: layer_polygon.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_Polygon); +SYNFIG_LAYER_SET_NAME(Layer_Polygon,"polygon"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Polygon,_("Polygon")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Polygon,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(Layer_Polygon,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Polygon,"$Id: layer_polygon.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === C L A S S E S ======================================================= */ diff --git a/synfig-core/trunk/src/synfig/layer_polygon.h b/synfig-core/trunk/src/synfig/layer_polygon.h index 0f2bce3..464ac29 100644 --- a/synfig-core/trunk/src/synfig/layer_polygon.h +++ b/synfig-core/trunk/src/synfig/layer_polygon.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_polygon.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_POLYGON_H -#define __SINFG_LAYER_POLYGON_H +#ifndef __SYNFIG_LAYER_POLYGON_H +#define __SYNFIG_LAYER_POLYGON_H /* === H E A D E R S ======================================================= */ @@ -38,14 +38,14 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Layer_Polygon ** \beief writeme ** \todo This layer needs to support multiple polygons */ class Layer_Polygon : public Layer_Shape { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: @@ -78,7 +78,7 @@ public: //! Updates EdgeTable so it will reflect the parameter data void sync(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; @@ -89,7 +89,7 @@ private: bool render_polyspan(Surface *surface,PolySpan &polyspan)const; }; // END of Layer_Polygon -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ #endif diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index 6c60616..f8174fe 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_shape.cpp ** \brief Template Header ** @@ -50,18 +50,18 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_Shape); -SINFG_LAYER_SET_NAME(Layer_Shape,"shape"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_Shape,_("Shape")); -SINFG_LAYER_SET_CATEGORY(Layer_Shape,_("Internal")); -SINFG_LAYER_SET_VERSION(Layer_Shape,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_Shape,"$Id: layer_shape.cpp,v 1.2 2005/01/24 03:08:18 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_Shape); +SYNFIG_LAYER_SET_NAME(Layer_Shape,"shape"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shape,_("Shape")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Shape,_("Internal")); +SYNFIG_LAYER_SET_VERSION(Layer_Shape,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Shape,"$Id: layer_shape.cpp,v 1.2 2005/01/24 03:08:18 darco Exp $"); #define EPSILON 1e-12 @@ -453,7 +453,7 @@ struct CurveArray if(dp == 0) { - sinfg::warning("polish_cubicroot: Derivative should not vanish!!!"); + synfig::warning("polish_cubicroot: Derivative should not vanish!!!"); return t; } @@ -1198,8 +1198,8 @@ Layer_Shape::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Layer_Shape::hit_check(sinfg::Context context, const sinfg::Point &p)const +synfig::Layer::Handle +Layer_Shape::hit_check(synfig::Context context, const synfig::Point &p)const { Point pos(p-offset); @@ -1216,7 +1216,7 @@ Layer_Shape::hit_check(sinfg::Context context, const sinfg::Point &p)const if(intersect) { - sinfg::Layer::Handle tmp; + synfig::Layer::Handle tmp; if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(p))) return tmp; if(Color::is_onto(get_blend_method())) @@ -1226,11 +1226,11 @@ Layer_Shape::hit_check(sinfg::Context context, const sinfg::Point &p)const return const_cast(this); }else if(get_blend_method() == Color::BLEND_ALPHA_OVER) { - sinfg::info("layer_shape::hit_check - we've got alphaover"); + synfig::info("layer_shape::hit_check - we've got alphaover"); //if there's something in the lower layer then we're set... if(color.get_a() < 0.1 && get_amount() > .9) { - sinfg::info("layer_shape::hit_check - can see through us... so nothing"); + synfig::info("layer_shape::hit_check - can see through us... so nothing"); return Handle(); }else return context.hit_check(p); }else @@ -1435,7 +1435,7 @@ void Layer_Shape::PolySpan::line_to(Real x, Real y) cur_y = yin; } } - } catch(...) { sinfg::error("line_to: cur_x=%f, cur_y=%f, x=%f, y=%f", cur_x, cur_y, x, y); throw; } + } catch(...) { synfig::error("line_to: cur_x=%f, cur_y=%f, x=%f, y=%f", cur_x, cur_y, x, y); throw; } flags |= NotClosed|NotSorted; } @@ -2579,7 +2579,7 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co //we are done if(cb && !cb->amount_complete(100,100)) { - sinfg::warning("Layer_Shape: could not set amount complete"); + synfig::warning("Layer_Shape: could not set amount complete"); return false; } @@ -2683,7 +2683,7 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int quality, return false; } - } catch(...) { sinfg::error("Layer_Shape::render_shape()1: Caught an exception after %d loops, rethrowing...", tmp); throw; } + } catch(...) { synfig::error("Layer_Shape::render_shape()1: Caught an exception after %d loops, rethrowing...", tmp); throw; } //transfer all the data - RLE optimized for(curnum=0; curnum < number;) diff --git a/synfig-core/trunk/src/synfig/layer_shape.h b/synfig-core/trunk/src/synfig/layer_shape.h index f88a894..01d4dba 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.h +++ b/synfig-core/trunk/src/synfig/layer_shape.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_shape.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_SHAPE_H -#define __SINFG_LAYER_SHAPE_H +#ifndef __SYNFIG_LAYER_SHAPE_H +#define __SYNFIG_LAYER_SHAPE_H /* === H E A D E R S ======================================================= */ @@ -39,13 +39,13 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Layer_Shape ** \beief writeme */ class Layer_Shape : public Layer_Composite, public Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: @@ -92,14 +92,14 @@ public: void close(); void endpath(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; virtual Vocab get_param_vocab()const; virtual Color get_color(Context context, const Point &pos)const; virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; - virtual sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; virtual Rect get_bounding_rect()const; private: @@ -111,7 +111,7 @@ private: virtual bool render_shape(etl::surface *surface,int quality,const RendDesc &renddesc, ProgressCallback *cb)const; }; // END of Layer_Shape -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ #endif diff --git a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp index ca895c9..85b20aa 100644 --- a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp +++ b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_solidcolor.cpp ** \brief Template Header ** @@ -44,16 +44,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(Layer_SolidColor); -SINFG_LAYER_SET_NAME(Layer_SolidColor,"SolidColor"); -SINFG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,_("Solid Color")); -SINFG_LAYER_SET_CATEGORY(Layer_SolidColor,_("Geometry")); -SINFG_LAYER_SET_VERSION(Layer_SolidColor,"0.1"); -SINFG_LAYER_SET_CVS_ID(Layer_SolidColor,"$Id: layer_solidcolor.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_LAYER_INIT(Layer_SolidColor); +SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"SolidColor"); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,_("Solid Color")); +SYNFIG_LAYER_SET_CATEGORY(Layer_SolidColor,_("Geometry")); +SYNFIG_LAYER_SET_VERSION(Layer_SolidColor,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(Layer_SolidColor,"$Id: layer_solidcolor.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -98,8 +98,8 @@ Layer_SolidColor::get_param_vocab()const return ret; } -sinfg::Layer::Handle -Layer_SolidColor::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +Layer_SolidColor::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this); diff --git a/synfig-core/trunk/src/synfig/layer_solidcolor.h b/synfig-core/trunk/src/synfig/layer_solidcolor.h index 07f8106..bbdf7ec 100644 --- a/synfig-core/trunk/src/synfig/layer_solidcolor.h +++ b/synfig-core/trunk/src/synfig/layer_solidcolor.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file layer_solidcolor.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LAYER_SOLIDCOLOR_H -#define __SINFG_LAYER_SOLIDCOLOR_H +#ifndef __SYNFIG_LAYER_SOLIDCOLOR_H +#define __SYNFIG_LAYER_SOLIDCOLOR_H /* === H E A D E R S ======================================================= */ @@ -35,11 +35,11 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Layer_SolidColor : public Layer_Composite, public Layer_NoDeform { - SINFG_LAYER_MODULE_EXT + SYNFIG_LAYER_MODULE_EXT private: @@ -49,7 +49,7 @@ public: Layer_SolidColor(); - virtual bool set_param(const String & param, const sinfg::ValueBase &value); + virtual bool set_param(const String & param, const synfig::ValueBase &value); virtual ValueBase get_param(const String & param)const; @@ -59,11 +59,11 @@ public: virtual Vocab get_param_vocab()const; - virtual sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const; + virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const; }; // END of class Layer_SolidColor -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/listimporter.cpp b/synfig-core/trunk/src/synfig/listimporter.cpp index b138d66..a2c14f7 100644 --- a/synfig-core/trunk/src/synfig/listimporter.cpp +++ b/synfig-core/trunk/src/synfig/listimporter.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file listimporter.cpp ** \brief Template File ** @@ -38,7 +38,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -58,7 +58,7 @@ ListImporter::ListImporter(const String &filename) if(!stream) { - sinfg::error("Unable to open "+filename); + synfig::error("Unable to open "+filename); return; } String line; @@ -72,7 +72,7 @@ ListImporter::ListImporter(const String &filename) if(line.find(String("FPS "))==0) { fps=atof(String(line.begin()+4,line.end()).c_str()); - //sinfg::warning("FPS=%f",fps); + //synfig::warning("FPS=%f",fps); if(!fps) fps=15; continue; @@ -101,7 +101,7 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) if(!filename_list.size()) { if(cb)cb->error(_("No images in list")); - else sinfg::error(_("No images in list")); + else synfig::error(_("No images in list")); return false; } @@ -129,7 +129,7 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) if(!importer) { if(cb)cb->error(_("Unable to open ")+filename_list[frame]); - else sinfg::error(_("Unable to open ")+filename_list[frame]); + else synfig::error(_("Unable to open ")+filename_list[frame]); return false; } @@ -138,7 +138,7 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb) if(!importer->get_frame(surface,0,cb)) { if(cb)cb->error(_("Unable to get frame from ")+filename_list[frame]); - else sinfg::error(_("Unable to get frame from ")+filename_list[frame]); + else synfig::error(_("Unable to get frame from ")+filename_list[frame]); return false; } diff --git a/synfig-core/trunk/src/synfig/listimporter.h b/synfig-core/trunk/src/synfig/listimporter.h index 3af78e1..21d62bd 100644 --- a/synfig-core/trunk/src/synfig/listimporter.h +++ b/synfig-core/trunk/src/synfig/listimporter.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file listimporter.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_LISTIMPORTER_H -#define __SINFG_LISTIMPORTER_H +#ifndef __SYNFIG_LISTIMPORTER_H +#define __SYNFIG_LISTIMPORTER_H /* === H E A D E R S ======================================================= */ @@ -40,7 +40,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class ListImporter ** \todo Write more detailed description @@ -64,7 +64,7 @@ public: static Importer* create(const char *filename); }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index 8f1fd68..9a02faa 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file loadcanvas.cpp ** \brief writeme ** @@ -69,15 +69,15 @@ /* === U S I N G =========================================================== */ using namespace std; -using namespace sinfg; +using namespace synfig; using namespace etl; /* class test_class { static int bleh; public: - test_class() { assert(!bleh); bleh++; sinfg::info("test_class: initi: %d",bleh); } - ~test_class() { assert(bleh); sinfg::info("test_class: uninit: %d",bleh); bleh--; } + test_class() { assert(!bleh); bleh++; synfig::info("test_class: initi: %d",bleh); } + ~test_class() { assert(bleh); synfig::info("test_class: uninit: %d",bleh); bleh--; } }; int test_class::bleh(0); @@ -92,7 +92,7 @@ inline bool is_whitespace(char x) { return ((x)=='\n' || (x)=='\t' || (x)==' '); static std::map* open_canvas_map_(0); -std::map >& sinfg::get_open_canvas_map() +std::map >& synfig::get_open_canvas_map() { if(!open_canvas_map_) open_canvas_map_=new std::map; @@ -103,7 +103,7 @@ static void _remove_from_open_canvas_map(Canvas *x) { get_open_canvas_map().eras static void _canvas_file_name_changed(Canvas *x) { - std::map >::iterator iter; + std::map >::iterator iter; for(iter=get_open_canvas_map().begin();iter!=get_open_canvas_map().end();++iter) if(iter->second==x) @@ -117,7 +117,7 @@ static void _canvas_file_name_changed(Canvas *x) } Canvas::Handle -sinfg::open_canvas(const String &filename) +synfig::open_canvas(const String &filename) { CanvasParser parser; @@ -132,7 +132,7 @@ sinfg::open_canvas(const String &filename) } Canvas::Handle -sinfg::open_canvas_as(const String &filename,const String &as) +synfig::open_canvas_as(const String &filename,const String &as) { CanvasParser parser; @@ -147,7 +147,7 @@ sinfg::open_canvas_as(const String &filename,const String &as) } Canvas::Handle -sinfg::string_to_canvas(const String &data) +synfig::string_to_canvas(const String &data) { CanvasParser parser; @@ -179,7 +179,7 @@ void CanvasParser::warning(xmlpp::Node *element, const String &text) { string str=strprintf("%s:<%s>:%d: warning: ",filename.c_str(),element->get_name().c_str(),element->get_line())+text; - //sinfg::warning(str); + //synfig::warning(str); cerr<=max_warnings_) @@ -194,7 +194,7 @@ CanvasParser::error(xmlpp::Node *element, const String &text) if(!allow_errors_) throw runtime_error(str); cerr<get_name()=="string"); @@ -420,13 +420,13 @@ CanvasParser::parse_string(xmlpp::Element *element,Canvas::Handle canvas) if(element->get_children().empty()) { warning(element, "Undefined value in "); - return sinfg::String(); + return synfig::String(); } if(element->get_child_text()->get_content().empty()) { warning(element, "Content element of appears to be empty"); - return sinfg::String(); + return synfig::String(); } return element->get_child_text()->get_content(); @@ -975,22 +975,22 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) if(child->get_attribute("tension")) { - sinfg::String str(child->get_attribute("tension")->get_value()); + synfig::String str(child->get_attribute("tension")->get_value()); waypoint->set_tension(atof(str.c_str())); } if(child->get_attribute("temporal-tension")) { - sinfg::String str(child->get_attribute("temporal-tension")->get_value()); + synfig::String str(child->get_attribute("temporal-tension")->get_value()); waypoint->set_time_tension(atof(str.c_str())); } if(child->get_attribute("continuity")) { - sinfg::String str(child->get_attribute("continuity")->get_value()); + synfig::String str(child->get_attribute("continuity")->get_value()); waypoint->set_continuity(atof(str.c_str())); } if(child->get_attribute("bias")) { - sinfg::String str(child->get_attribute("bias")->get_value()); + synfig::String str(child->get_attribute("bias")->get_value()); waypoint->set_bias(atof(str.c_str())); } @@ -1581,8 +1581,8 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) // Parse begin/end waypoints { - typedef sinfg::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; String begin_sequence; String end_sequence; @@ -1621,7 +1621,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) int space=timecode.find_first_of(' '); priority=atoi(String(timecode,1,space-1).c_str()); timecode=String(timecode.begin()+space+1,timecode.end()); - //sinfg::info("priority: %d timecode: %s",priority,timecode.c_str()); + //synfig::info("priority: %d timecode: %s",priority,timecode.c_str()); } timing_info.push_back( @@ -1657,7 +1657,7 @@ CanvasParser::parse_dynamic_list(xmlpp::Element *element,Canvas::Handle canvas) int space=timecode.find_first_of(' '); priority=atoi(String(timecode,1,space-1).c_str()); timecode=String(timecode.begin()+space+1,timecode.end()); - //sinfg::info("priority: %d timecode: %s",priority,timecode.c_str()); + //synfig::info("priority: %d timecode: %s",priority,timecode.c_str()); } timing_info.push_back( @@ -2291,20 +2291,20 @@ CanvasParser::parse_from_file_as(const String &file,const String &as) return canvas; } } - catch(Exception::BadLinkName) { sinfg::error("BadLinkName Thrown"); } - catch(Exception::BadType) { sinfg::error("BadType Thrown"); } - catch(Exception::FileNotFound) { sinfg::error("FileNotFound Thrown"); } - catch(Exception::IDNotFound) { sinfg::error("IDNotFound Thrown"); } - catch(Exception::IDAlreadyExists) { sinfg::error("IDAlreadyExists Thrown"); } + catch(Exception::BadLinkName) { synfig::error("BadLinkName Thrown"); } + catch(Exception::BadType) { synfig::error("BadType Thrown"); } + catch(Exception::FileNotFound) { synfig::error("FileNotFound Thrown"); } + catch(Exception::IDNotFound) { synfig::error("IDNotFound Thrown"); } + catch(Exception::IDAlreadyExists) { synfig::error("IDAlreadyExists Thrown"); } catch(const std::exception& ex) { - sinfg::error("Standard Exception: "+String(ex.what())); + synfig::error("Standard Exception: "+String(ex.what())); return Canvas::Handle(); } catch(const String& str) { cerr< >& get_open_canvas_map(); +std::map >& get_open_canvas_map(); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index b253c3b..48b3546 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file main.cpp ** \brief \writeme ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -//#define SINFG_NO_ANGLE +//#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -65,15 +65,15 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ -#define MODULE_LIST_FILENAME "sinfg_modules.cfg" +#define MODULE_LIST_FILENAME "synfig_modules.cfg" /* === S T A T I C S ======================================================= */ -static etl::reference_counter sinfg_ref_count_(0); +static etl::reference_counter synfig_ref_count_(0); /* === P R O C E D U R E S ================================================= */ @@ -87,7 +87,7 @@ static etl::reference_counter sinfg_ref_count_(0); const char * -sinfg::get_version() +synfig::get_version() { #ifdef VERSION return VERSION; @@ -97,13 +97,13 @@ sinfg::get_version() } const char * -sinfg::get_build_date() +synfig::get_build_date() { return __DATE__; } const char * -sinfg::get_build_time() +synfig::get_build_time() { return __TIME__; } @@ -111,35 +111,35 @@ sinfg::get_build_time() extern const char *get_build_time(); bool -sinfg::check_version_(int version,int vec_size, int color_size,int canvas_size,int layer_size) +synfig::check_version_(int version,int vec_size, int color_size,int canvas_size,int layer_size) { bool ret=true; CHECK_EXPIRE_TIME(); - if(version!=SINFG_LIBRARY_VERSION) + if(version!=SYNFIG_LIBRARY_VERSION) { - sinfg::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SINFG_LIBRARY_VERSION,version); + synfig::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SYNFIG_LIBRARY_VERSION,version); ret=false; } if(vec_size!=sizeof(Vector)) { - sinfg::error(_("Size of Vector mismatch (app:%d, lib:%d)"),vec_size,sizeof(Vector)); + synfig::error(_("Size of Vector mismatch (app:%d, lib:%d)"),vec_size,sizeof(Vector)); ret=false; } if(color_size!=sizeof(Color)) { - sinfg::error(_("Size of Color mismatch (app:%d, lib:%d)"),color_size,sizeof(Color)); + synfig::error(_("Size of Color mismatch (app:%d, lib:%d)"),color_size,sizeof(Color)); ret=false; } if(canvas_size!=sizeof(Canvas)) { - sinfg::error(_("Size of Canvas mismatch (app:%d, lib:%d)"),canvas_size,sizeof(Canvas)); + synfig::error(_("Size of Canvas mismatch (app:%d, lib:%d)"),canvas_size,sizeof(Canvas)); ret=false; } if(layer_size!=sizeof(Layer)) { - sinfg::error(_("Size of Layer mismatch (app:%d, lib:%d)"),layer_size,sizeof(Layer)); + synfig::error(_("Size of Layer mismatch (app:%d, lib:%d)"),layer_size,sizeof(Layer)); ret=false; } @@ -147,7 +147,7 @@ sinfg::check_version_(int version,int vec_size, int color_size,int canvas_size,i } static void broken_pipe_signal (int sig) { - sinfg::warning("Broken Pipe..."); + synfig::warning("Broken Pipe..."); } bool retrieve_modules_to_load(String filename,std::list &modules_to_load) @@ -206,14 +206,14 @@ bool retrieve_modules_to_load(String filename,std::list &modules_to_load -sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): - ref_count_(sinfg_ref_count_) +synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): + ref_count_(synfig_ref_count_) { if(ref_count_.count()) return; - sinfg_ref_count_.reset(); - ref_count_=sinfg_ref_count_; + synfig_ref_count_.reset(); + ref_count_=synfig_ref_count_; // Add initialization after this point @@ -286,7 +286,7 @@ sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): locations.push_back("standard"); locations.push_back("./"MODULE_LIST_FILENAME); //1 locations.push_back("../etc/"MODULE_LIST_FILENAME); //1 - locations.push_back("~/.sinfg/"MODULE_LIST_FILENAME); //2 + locations.push_back("~/.synfig/"MODULE_LIST_FILENAME); //2 locations.push_back(prefix+"/etc/"+MODULE_LIST_FILENAME); //3 locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME); #ifdef SYSCONFDIR @@ -311,19 +311,19 @@ sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): "standard", //0 "./"MODULE_LIST_FILENAME, //1 "../etc/"MODULE_LIST_FILENAME, //1 - "~/.sinfg/"MODULE_LIST_FILENAME, //2 - "/usr/local/lib/sinfg/modules/"MODULE_LIST_FILENAME, //3 + "~/.synfig/"MODULE_LIST_FILENAME, //2 + "/usr/local/lib/synfig/modules/"MODULE_LIST_FILENAME, //3 "/usr/local/etc/"MODULE_LIST_FILENAME, #ifdef SYSCONFDIR SYSCONFDIR"/"MODULE_LIST_FILENAME, #endif #ifdef __APPLE__ - "/Library/Frameworks/sinfg.framework/Resources/"MODULE_LIST_FILENAME, - "/Library/SINFG/"MODULE_LIST_FILENAME, - "~/Library/SINFG/"MODULE_LIST_FILENAME, + "/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME, + "/Library/SYNFIG/"MODULE_LIST_FILENAME, + "~/Library/SYNFIG/"MODULE_LIST_FILENAME, #endif #ifdef WIN32 - "C:\\Program Files\\SINFG\\etc\\"MODULE_LIST_FILENAME, + "C:\\Program Files\\SYNFIG\\etc\\"MODULE_LIST_FILENAME, #endif }; */ @@ -349,22 +349,22 @@ sinfg::Main::Main(const sinfg::String& basepath,ProgressCallback *cb): if(cb)cb->task(_("DONE")); } -sinfg::Main::~Main() +synfig::Main::~Main() { ref_count_.detach(); - if(!sinfg_ref_count_.unique()) + if(!synfig_ref_count_.unique()) return; - sinfg_ref_count_.detach(); + synfig_ref_count_.detach(); // Add deinitialization after this point if(get_open_canvas_map().size()) { - sinfg::warning("Canvases still open!"); - std::map >::iterator iter; + synfig::warning("Canvases still open!"); + std::map >::iterator iter; for(iter=get_open_canvas_map().begin();iter!=get_open_canvas_map().end();++iter) { - sinfg::warning("%s: count()=%d",iter->first.c_str(), iter->second.count()); + synfig::warning("%s: count()=%d",iter->first.c_str(), iter->second.count()); } } @@ -392,7 +392,7 @@ sinfg::Main::~Main() void -sinfg::error(const char *format,...) +synfig::error(const char *format,...) { va_list args; va_start(args,format); @@ -400,14 +400,14 @@ sinfg::error(const char *format,...) } void -sinfg::error(const String &str) +synfig::error(const String &str) { static Mutex mutex; Mutex::Lock lock(mutex); - cerr<<"sinfg("<Name()]=mod; } bool -sinfg::Module::Register(const String &module_name, ProgressCallback *callback) +synfig::Module::Register(const String &module_name, ProgressCallback *callback) { lt_dlhandle module; diff --git a/synfig-core/trunk/src/synfig/module.h b/synfig-core/trunk/src/synfig/module.h index 31d3bae..e3afdfb 100644 --- a/synfig-core/trunk/src/synfig/module.h +++ b/synfig-core/trunk/src/synfig/module.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file module.h ** \brief writeme ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MODULE_H -#define __SINFG_MODULE_H +#ifndef __SYNFIG_MODULE_H +#define __SYNFIG_MODULE_H /* === H E A D E R S ======================================================= */ @@ -41,7 +41,7 @@ /* === M A C R O S ========================================================= */ //! Marks the start of a module description -#define MODULE_DESC_BEGIN(x) struct x##_modclass : public sinfg::Module { x##_modclass(sinfg::ProgressCallback *callback=NULL); +#define MODULE_DESC_BEGIN(x) struct x##_modclass : public synfig::Module { x##_modclass(synfig::ProgressCallback *callback=NULL); //! Sets the localized name of the module #define MODULE_NAME(x) virtual const char * Name() { return x; } @@ -59,7 +59,7 @@ #define MODULE_COPYRIGHT(x) virtual const char * Copyright() { return x; } //! Describes the module's construction function -#define MODULE_CONSTRUCTOR(x) bool constructor_(sinfg::ProgressCallback *cb) { return x(cb); } +#define MODULE_CONSTRUCTOR(x) bool constructor_(synfig::ProgressCallback *cb) { return x(cb); } //! Describes the module's destruction function #define MODULE_DESTRUCTOR(x) virtual void destructor_() { return x(); } @@ -71,26 +71,26 @@ #ifdef __APPLE__ //! Marks the start of a module's inventory #define MODULE_INVENTORY_BEGIN(x) extern "C" { \ - sinfg::Module* _##x##_LTX_new_instance(sinfg::ProgressCallback *cb) \ - { if(SINFG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\ + synfig::Module* _##x##_LTX_new_instance(synfig::ProgressCallback *cb) \ + { if(SYNFIG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\ if(cb)cb->error(#x": Unable to load module due to version mismatch."); return NULL; } \ - }; x##_modclass::x##_modclass(sinfg::ProgressCallback *cb) { + }; x##_modclass::x##_modclass(synfig::ProgressCallback *cb) { #else //! Marks the start of a module's inventory #define MODULE_INVENTORY_BEGIN(x) extern "C" { \ - sinfg::Module* x##_LTX_new_instance(sinfg::ProgressCallback *cb) \ - { if(SINFG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\ + synfig::Module* x##_LTX_new_instance(synfig::ProgressCallback *cb) \ + { if(SYNFIG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\ if(cb)cb->error(#x": Unable to load module due to version mismatch."); return NULL; } \ - }; x##_modclass::x##_modclass(sinfg::ProgressCallback *cb) { + }; x##_modclass::x##_modclass(synfig::ProgressCallback *cb) { #endif //! Marks the start of the layers in the module's inventory #define BEGIN_LAYERS { //! DEPRECATED - use @INCLUDE_LAYER() -//#define LAYER(x) sinfg::Layer::book()[sinfg::String(x::name__)]=x::create; -#define LAYER(class) sinfg::Layer::register_in_book(sinfg::Layer::BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__)); -#define LAYER_ALIAS(class,alias) sinfg::Layer::register_in_book(sinfg::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__)); +//#define LAYER(x) synfig::Layer::book()[synfig::String(x::name__)]=x::create; +#define LAYER(class) synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__)); +#define LAYER_ALIAS(class,alias) synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__)); //! Marks the end of the layers in the module's inventory #define END_LAYERS } @@ -98,9 +98,9 @@ //! Marks the start of the targets in the module's inventory #define BEGIN_TARGETS { -#define TARGET(x) sinfg::Target::book()[sinfg::String(x::name__)]=std::pair(x::create,sinfg::String(x::ext__));sinfg::Target::ext_book()[sinfg::String(x::ext__)]=x::name__; +#define TARGET(x) synfig::Target::book()[synfig::String(x::name__)]=std::pair(x::create,synfig::String(x::ext__));synfig::Target::ext_book()[synfig::String(x::ext__)]=x::name__; -#define TARGET_EXT(x,y) sinfg::Target::ext_book()[sinfg::String(y)]=x::name__; +#define TARGET_EXT(x,y) synfig::Target::ext_book()[synfig::String(y)]=x::name__; //! Marks the end of the targets in the module's inventory #define END_TARGETS } @@ -108,9 +108,9 @@ //! Marks the start of the importers in the module's inventory #define BEGIN_IMPORTERS { -#define IMPORTER(x) sinfg::Importer::book()[sinfg::String(x::ext__)]=x::create; +#define IMPORTER(x) synfig::Importer::book()[synfig::String(x::ext__)]=x::create; -#define IMPORTER_EXT(x,y) sinfg::Importer::book()[sinfg::String(y)]=x::create; +#define IMPORTER_EXT(x,y) synfig::Importer::book()[synfig::String(y)]=x::create; //! Marks the end of the importers in the module's inventory #define END_IMPORTERS } @@ -122,7 +122,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ProgressCallback; @@ -132,7 +132,7 @@ class ProgressCallback; class Module : public etl::shared_object { public: - bool constructor_(sinfg::ProgressCallback *cb) { return true; } + bool constructor_(synfig::ProgressCallback *cb) { return true; } virtual void destructor_() { } typedef etl::handle Handle; @@ -159,12 +159,12 @@ public: virtual const char * Desc() { return " "; } virtual const char * Author() { return " "; } virtual const char * Version() { return " "; } - virtual const char * Copyright() { return SINFG_COPYRIGHT; } + virtual const char * Copyright() { return SYNFIG_COPYRIGHT; } virtual ~Module() { destructor_(); } }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/mutex.cpp b/synfig-core/trunk/src/synfig/mutex.cpp index 4ede578..ace7bd1 100644 --- a/synfig-core/trunk/src/synfig/mutex.cpp +++ b/synfig-core/trunk/src/synfig/mutex.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file mutex.cpp ** \brief Template File ** @@ -52,7 +52,7 @@ //using namespace std; //using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/mutex.h b/synfig-core/trunk/src/synfig/mutex.h index 04dfb25..1066356 100644 --- a/synfig-core/trunk/src/synfig/mutex.h +++ b/synfig-core/trunk/src/synfig/mutex.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file mutex.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_MUTEX_H -#define __SINFG_MUTEX_H +#ifndef __SYNFIG_MUTEX_H +#define __SYNFIG_MUTEX_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class RecMutex; @@ -110,7 +110,7 @@ public: bool writer_trylock(); }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/node.cpp b/synfig-core/trunk/src/synfig/node.cpp index fdd2bfe..55e28f5 100644 --- a/synfig-core/trunk/src/synfig/node.cpp +++ b/synfig-core/trunk/src/synfig/node.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file node.cpp ** \brief Template File ** @@ -46,7 +46,7 @@ using namespace __gnu_cxx; using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -98,8 +98,8 @@ static GlobalNodeMap& global_node_map() /* === P R O C E D U R E S ================================================= */ -sinfg::Node* -sinfg::find_node(const GUID& guid) +synfig::Node* +synfig::find_node(const GUID& guid) { if(global_node_map().count(guid)==0) return 0; @@ -107,7 +107,7 @@ sinfg::find_node(const GUID& guid) } static void -refresh_node(sinfg::Node* node, GUID old_guid) +refresh_node(synfig::Node* node, GUID old_guid) { assert(global_node_map().count(old_guid)); global_node_map().erase(old_guid); diff --git a/synfig-core/trunk/src/synfig/node.h b/synfig-core/trunk/src/synfig/node.h index ac87725..b24c7e3 100644 --- a/synfig-core/trunk/src/synfig/node.h +++ b/synfig-core/trunk/src/synfig/node.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file node.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_PARENTNODE_H -#define __SINFG_PARENTNODE_H +#ifndef __SYNFIG_PARENTNODE_H +#define __SYNFIG_PARENTNODE_H /* === H E A D E R S ======================================================= */ @@ -40,7 +40,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class TimePoint { @@ -226,17 +226,17 @@ protected: virtual void get_times_vfunc(time_set &set) const = 0; }; -sinfg::Node* sinfg::find_node(const sinfg::GUID& guid); +synfig::Node* synfig::find_node(const synfig::GUID& guid); template etl::handle -guid_cast(const sinfg::GUID& guid) +guid_cast(const synfig::GUID& guid) { - return etl::handle::cast_dynamic(sinfg::find_node(guid)); + return etl::handle::cast_dynamic(synfig::find_node(guid)); } typedef etl::handle NodeHandle; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/palette.cpp b/synfig-core/trunk/src/synfig/palette.cpp index 4ff3a66..1208a8d 100644 --- a/synfig-core/trunk/src/synfig/palette.cpp +++ b/synfig-core/trunk/src/synfig/palette.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.cpp ** \brief Template File ** @@ -40,11 +40,11 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ -#define PALETTE_FILE_COOKIE "SINFGPAL1.0" +#define PALETTE_FILE_COOKIE "SYNFIGPAL1.0" /* === G L O B A L S ======================================================= */ @@ -251,7 +251,7 @@ Palette::grayscale(int steps) } void -Palette::save_to_file(const sinfg::String& filename)const +Palette::save_to_file(const synfig::String& filename)const { const_iterator iter; @@ -275,7 +275,7 @@ Palette::save_to_file(const sinfg::String& filename)const } Palette -Palette::load_from_file(const sinfg::String& filename) +Palette::load_from_file(const synfig::String& filename) { std::ifstream file(filename.c_str()); diff --git a/synfig-core/trunk/src/synfig/palette.h b/synfig-core/trunk/src/synfig/palette.h index 066e4e0..ec43197 100644 --- a/synfig-core/trunk/src/synfig/palette.h +++ b/synfig-core/trunk/src/synfig/palette.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file Palette.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_PALETTE_H -#define __SINFG_PALETTE_H +#ifndef __SYNFIG_PALETTE_H +#define __SYNFIG_PALETTE_H /* === H E A D E R S ======================================================= */ @@ -36,7 +36,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Surface; @@ -81,12 +81,12 @@ public: static Palette grayscale(int steps=16); - void save_to_file(const sinfg::String& filename)const; + void save_to_file(const synfig::String& filename)const; - static Palette load_from_file(const sinfg::String& filename); + static Palette load_from_file(const synfig::String& filename); }; // END of class Palette -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/paramdesc.cpp b/synfig-core/trunk/src/synfig/paramdesc.cpp index 0734782..b10602a 100644 --- a/synfig-core/trunk/src/synfig/paramdesc.cpp +++ b/synfig-core/trunk/src/synfig/paramdesc.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file paramdesc.cpp ** \brief Template File ** @@ -37,7 +37,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -47,7 +47,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -ParamDesc::ParamDesc(sinfg::Color::BlendMethod, const String &a): +ParamDesc::ParamDesc(synfig::Color::BlendMethod, const String &a): name_ (a), local_name_ (a), scalar_ (1.0), diff --git a/synfig-core/trunk/src/synfig/paramdesc.h b/synfig-core/trunk/src/synfig/paramdesc.h index 3daf7a3..a3eb5c9 100644 --- a/synfig-core/trunk/src/synfig/paramdesc.h +++ b/synfig-core/trunk/src/synfig/paramdesc.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file paramdesc.h ** \brief ParamDesc Class Implementation ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_PARAMDESC_H -#define __SINFG_PARAMDESC_H +#ifndef __SYNFIG_PARAMDESC_H +#define __SYNFIG_PARAMDESC_H /* === H E A D E R S ======================================================= */ @@ -37,7 +37,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueBase; @@ -104,7 +104,7 @@ public: ParamDesc(const ValueBase&, const String &a); - ParamDesc(sinfg::Color::BlendMethod, const String &a); + ParamDesc(synfig::Color::BlendMethod, const String &a); /* @@ -219,7 +219,7 @@ class ParamVocab : public std::list< ParamDesc > { }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/pch.h b/synfig-core/trunk/src/synfig/pch.h index 08a60d6..226ed9e 100644 --- a/synfig-core/trunk/src/synfig/pch.h +++ b/synfig-core/trunk/src/synfig/pch.h @@ -1,5 +1,5 @@ /* ======================================================================== -** Sinfg +** Synfig ** Pre-Compiled Header ** $Id: pch.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,13 +20,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_PCH_H -#define __SINFG_PCH_H +#ifndef __SYNFIG_PCH_H +#define __SYNFIG_PCH_H /* === H E A D E R S ======================================================= */ #include -#include "sinfg.h" +#include "synfig.h" /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/polynomial_root.cpp b/synfig-core/trunk/src/synfig/polynomial_root.cpp index e9cf76d..2b5c75d 100644 --- a/synfig-core/trunk/src/synfig/polynomial_root.cpp +++ b/synfig-core/trunk/src/synfig/polynomial_root.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.cpp ** \brief Template File ** @@ -37,7 +37,7 @@ using namespace std; //using namespace etl; -//using namespace sinfg; +//using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/polynomial_root.h b/synfig-core/trunk/src/synfig/polynomial_root.h index a1a5c31..38bb5ef 100644 --- a/synfig-core/trunk/src/synfig/polynomial_root.h +++ b/synfig-core/trunk/src/synfig/polynomial_root.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file polynomial_root.h ** \brief Polynomial Root Finder Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_POLYNOMIAL_ROOT_H -#define __SINFG_POLYNOMIAL_ROOT_H +#ifndef __SYNFIG_POLYNOMIAL_ROOT_H +#define __SYNFIG_POLYNOMIAL_ROOT_H /* === H E A D E R S ======================================================= */ diff --git a/synfig-core/trunk/src/synfig/proto/nodebase.px b/synfig-core/trunk/src/synfig/proto/nodebase.px index 19b4ea2..b5ed847 100644 --- a/synfig-core/trunk/src/synfig/proto/nodebase.px +++ b/synfig-core/trunk/src/synfig/proto/nodebase.px @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file nodebase.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_NODEBASE_H -#define __SINFG_NODEBASE_H +#ifndef __SYNFIG_NODEBASE_H +#define __SYNFIG_NODEBASE_H /* === H E A D E R S ======================================================= */ @@ -37,7 +37,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { namespace Proto { typedef int Query; @@ -66,7 +66,7 @@ public: }; // END of class Proto::NodeBase }; // END of namespace Proto -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/protocol.h b/synfig-core/trunk/src/synfig/protocol.h index 33ec3f1..c24980e 100644 --- a/synfig-core/trunk/src/synfig/protocol.h +++ b/synfig-core/trunk/src/synfig/protocol.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file protocol.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_PROTOCOL_H -#define __SINFG_PROTOCOL_H +#ifndef __SYNFIG_PROTOCOL_H +#define __SYNFIG_PROTOCOL_H /* === H E A D E R S ======================================================= */ @@ -34,9 +34,10 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { -class Object +/* + * class Object { public: @@ -46,6 +47,7 @@ public: } }; +*/ class Protocol { @@ -58,7 +60,7 @@ class Protocol::Type { }; // END of class Protocol::Type -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/real.h b/synfig-core/trunk/src/synfig/real.h index edc65ed..85b3f44 100644 --- a/synfig-core/trunk/src/synfig/real.h +++ b/synfig-core/trunk/src/synfig/real.h @@ -1,6 +1,6 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file real.h -** \brief Provides the sinfg::Real typedef +** \brief Provides the synfig::Real typedef ** ** $Id: real.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -21,19 +21,19 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_REAL_H -#define __SINFG_REAL_H +#ifndef __SYNFIG_REAL_H +#define __SYNFIG_REAL_H /* === T Y P E D E F S ===================================================== */ -namespace sinfg { +namespace synfig { /*! \typedef Real ** \todo writeme */ typedef double Real; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/rect.cpp b/synfig-core/trunk/src/synfig/rect.cpp index a420ea0..b418f09 100644 --- a/synfig-core/trunk/src/synfig/rect.cpp +++ b/synfig-core/trunk/src/synfig/rect.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file rect.cpp ** \brief Template File ** @@ -36,7 +36,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/rect.h b/synfig-core/trunk/src/synfig/rect.h index 87f8dc5..ddd2605 100644 --- a/synfig-core/trunk/src/synfig/rect.h +++ b/synfig-core/trunk/src/synfig/rect.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file rect.h ** \brief Rectangle Class ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_RECT_H -#define __SINFG_RECT_H +#ifndef __SYNFIG_RECT_H +#define __SYNFIG_RECT_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Rect : public etl::rect { @@ -166,7 +166,7 @@ public: bool is_valid()const { return valid(); } }; // END of class Rect -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/renddesc.cpp b/synfig-core/trunk/src/synfig/renddesc.cpp index 0973b81..94dc16d 100644 --- a/synfig-core/trunk/src/synfig/renddesc.cpp +++ b/synfig-core/trunk/src/synfig/renddesc.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file renddesc.h_ ** \brief RendDesc ** @@ -37,7 +37,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/renddesc.h b/synfig-core/trunk/src/synfig/renddesc.h index 1498fe8..8211d3b 100644 --- a/synfig-core/trunk/src/synfig/renddesc.h +++ b/synfig-core/trunk/src/synfig/renddesc.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file renddesc.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_RENDERDESC_H -#define __SINFG_RENDERDESC_H +#ifndef __SYNFIG_RENDERDESC_H +#define __SYNFIG_RENDERDESC_H /* === H E A D E R S ======================================================= */ @@ -43,7 +43,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class RendDesc ** \todo writeme @@ -312,7 +312,7 @@ inline bool operator<=(RendDesc::Lock lhs, RendDesc::Lock rhs) } -}; /* end namespace sinfg */ +}; /* end namespace synfig */ /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/render.cpp b/synfig-core/trunk/src/synfig/render.cpp index acfcbe3..db06aad 100644 --- a/synfig-core/trunk/src/synfig/render.cpp +++ b/synfig-core/trunk/src/synfig/render.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file render.cpp ** \brief Renderer ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -47,7 +47,7 @@ #endif using namespace std; -using namespace sinfg; +using namespace synfig; using namespace etl; /* === M A C R O S ========================================================= */ @@ -55,7 +55,7 @@ using namespace etl; /* === P R O C E D U R E S ================================================= */ bool -sinfg::parametric_render( +synfig::parametric_render( Context context, Surface &surface, const RendDesc &desc, @@ -175,7 +175,7 @@ sinfg::parametric_render( } bool -sinfg::render( +synfig::render( Context context, Target_Scanline::Handle target, const RendDesc &desc, @@ -318,7 +318,7 @@ sinfg::render( } bool -sinfg::render_threaded( +synfig::render_threaded( Context context, Target_Scanline::Handle target, const RendDesc &desc, diff --git a/synfig-core/trunk/src/synfig/render.h b/synfig-core/trunk/src/synfig/render.h index 30b3364..8c449ca 100644 --- a/synfig-core/trunk/src/synfig/render.h +++ b/synfig-core/trunk/src/synfig/render.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file render.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_RENDER_H -#define __SINFG_RENDER_H +#ifndef __SYNFIG_RENDER_H +#define __SYNFIG_RENDER_H /* === H E A D E R S ======================================================= */ @@ -41,7 +41,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { //! Renders starting at \a context to \a target /*! \warning \a Target::set_rend_desc() must have @@ -58,7 +58,7 @@ extern bool render_threaded( Context context, ProgressCallback *callback, int threads); -}; /* end namespace sinfg */ +}; /* end namespace synfig */ /* -- E N D ----------------------------------------------------------------- */ diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp index 32c8203..06f5657 100644 --- a/synfig-core/trunk/src/synfig/savecanvas.cpp +++ b/synfig-core/trunk/src/synfig/savecanvas.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file savecanvas.cpp ** \brief Writeme ** @@ -57,7 +57,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -233,11 +233,11 @@ xmlpp::Element* encode_value(xmlpp::Element* root,const ValueBase &data,Canvas:: case ValueBase::TYPE_CANVAS: return encode_canvas(root,data.get(Canvas::Handle()).get()); case ValueBase::TYPE_NIL: - sinfg::error("Encountered NIL ValueBase"); + synfig::error("Encountered NIL ValueBase"); root->set_name("nil"); return root; default: - sinfg::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str())); + synfig::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str())); root->set_name("nil"); return root; } @@ -413,8 +413,8 @@ xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList:: // process waypoints { - typedef sinfg::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; String begin_sequence; String end_sequence; @@ -703,9 +703,9 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas) } bool -sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas) +synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas) { - sinfg::String tmp_filename(filename+".TMP"); + synfig::String tmp_filename(filename+".TMP"); try { @@ -716,7 +716,7 @@ sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas) document.write_to_file_formatted(tmp_filename); } - catch(...) { sinfg::error("sinfg::save_canvas(): Caught unknown exception"); return false; } + catch(...) { synfig::error("synfig::save_canvas(): Caught unknown exception"); return false; } #ifdef _WIN32 @@ -727,14 +727,14 @@ sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas) if(rename(tmp_filename.c_str(),filename.c_str())!=0) { rename(old_file,tmp_filename.c_str()); - sinfg::error("sinfg::save_canvas(): Unable to rename file to correct filename, errno=%d",errno); + synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno); return false; } remove(old_file); #else if(rename(tmp_filename.c_str(),filename.c_str())!=0) { - sinfg::error("sinfg::save_canvas(): Unable to rename file to correct filename, errno=%d",errno); + synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno); return false; } #endif @@ -743,7 +743,7 @@ sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas) } String -sinfg::canvas_to_string(Canvas::ConstHandle canvas) +synfig::canvas_to_string(Canvas::ConstHandle canvas) { assert(canvas); diff --git a/synfig-core/trunk/src/synfig/savecanvas.h b/synfig-core/trunk/src/synfig/savecanvas.h index e519415..c61fae0 100644 --- a/synfig-core/trunk/src/synfig/savecanvas.h +++ b/synfig-core/trunk/src/synfig/savecanvas.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file savecanvas.h ** \brief writeme ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SAVECANVAS_H -#define __SINFG_SAVECANVAS_H +#ifndef __SYNFIG_SAVECANVAS_H +#define __SYNFIG_SAVECANVAS_H /* === H E A D E R S ======================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /* === E X T E R N S ======================================================= */ @@ -46,7 +46,7 @@ bool save_canvas(const String &filename, Canvas::ConstHandle canvas); //! Stores a Canvas in a string in XML format String canvas_to_string(Canvas::ConstHandle canvas); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/segment.h b/synfig-core/trunk/src/synfig/segment.h index 10b1ab3..80e0ef3 100644 --- a/synfig-core/trunk/src/synfig/segment.h +++ b/synfig-core/trunk/src/synfig/segment.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file segment.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SEGMENT_H -#define __SINFG_SEGMENT_H +#ifndef __SYNFIG_SEGMENT_H +#define __SYNFIG_SEGMENT_H /* === H E A D E R S ======================================================= */ @@ -34,7 +34,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \struct Segment ** \todo writeme @@ -59,7 +59,7 @@ struct Segment { } }; // END of struct Segment -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/sinfg.h b/synfig-core/trunk/src/synfig/sinfg.h deleted file mode 100644 index 6f2c4e8..0000000 --- a/synfig-core/trunk/src/synfig/sinfg.h +++ /dev/null @@ -1,137 +0,0 @@ -/* === S I N F G =========================================================== */ -/*! \file sinfg.h -** \brief Primary Header for Sinfg -** -** $Id: sinfg.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ -** -** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. -** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. -** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. -** \endlegal -*/ -/* ========================================================================= */ - -/* === S T A R T =========================================================== */ - -#ifndef __SINFG__ -#define __SINFG__ - -#ifndef __cplusplus -#error Sorry, Sinfg only supports C++ at this time. See README for details. -#endif - -#warning The use of this header is deprecated. Please use the individual header files. - -/* === M A C R O S ========================================================= */ - -/*! \def SINFG_LEAN -** \brief Define this to remove unused features, speeding up compile time. -** -** Define SINFG_LEAN if your plug-in -** or program doesn't use the sinfg::Angle class -** or the rendering subsystem. This can speed up -** compiles. You may also wish to individualy -** use the macros SINFG_NO_ANGLE and -** SINFG_NO_RENDER. -** \see SINFG_NO_ANGLE, SINFG_NO_RENDER -*/ -#ifdef SINFG_LEAN -# ifndef SINFG_NO_ANGLE -# define SINFG_NO_ANGLE -# endif -# ifndef SINFG_NO_RENDER -# define SINFG_NO_RENDER -# endif -#endif - -/*! \def SINFG_LAYER -** The SINFG_LAYER macro is useful for when you -** are compiling layers, and can help to improve -** build time. -*/ -#ifdef SINFG_LAYER -# ifndef SINFG_NO_RENDER -# define SINFG_NO_RENDER -# endif -# define SINFG_NO_LOADSAVE -#endif - -/*! \def SINFG_TARGET -** The SINFG_TARGET macro is useful for when you -** are compiling render targets, and can help to -** improve build time. -*/ -#ifdef SINFG_TARGET -# ifdef SINFG_NO_RENDER -# error You defined SINFG_TARGET, but also SINFG_NO_RENDER. This doesnt make sense. -# endif -# ifndef SINFG_NO_ANGLE -# define SINFG_NO_ANGLE -# endif -# define SINFG_NO_LOADSAVE -#endif - -/*! \def SINFG_MODULE -** \todo Writeme -*/ -#ifdef SINFG_MODULE -# define SINFG_NO_LOADSAVE -#endif - -/*! \namespace sinfg -** \brief Where every function and class of the sinfg library can be found -** \todo Writeme -*/ - -/* === H E A D E R S ======================================================= */ - -#include "version.h" -#include "general.h" -#include "module.h" -#include "color.h" -#include "canvas.h" -#include "layer.h" -#include "vector.h" -#include "types.h" -#include "segment.h" - -#ifndef SINFG_NO_RENDER -# include "render.h" -#endif - -#ifndef SINFG_LAYER -#include "target.h" -#endif - -#include "valuenode.h" -#include "valuenode_subtract.h" -//#include "valuenode_animated.h" -#include "valuenode_composite.h" -#include "valuenode_const.h" -#include "valuenode_linear.h" -#include "valuenode_dynamiclist.h" -#include "valuenode_reference.h" - -#ifndef SINFG_NO_LOADSAVE -# include "savecanvas.h" -# include "loadcanvas.h" -#endif - -#include "importer.h" -#include "surface.h" - -#include "string.h" - -/* === C L A S S E S & S T R U C T S ======================================= */ - -/* === E N D =============================================================== */ - -#endif diff --git a/synfig-core/trunk/src/synfig/sinfg.nsh b/synfig-core/trunk/src/synfig/sinfg.nsh deleted file mode 100644 index f7c484a..0000000 --- a/synfig-core/trunk/src/synfig/sinfg.nsh +++ /dev/null @@ -1,19 +0,0 @@ -; The stuff to install -Section "Synfig Core" - - SectionIn RO - - ; Set output path to the installation directory. - SetOutPath "$INSTDIR\bin" - - ; Put file there - File "src\sinfg\.libs\libsinfg-0.dll" - -SectionEnd - -Section "un.Synfig Core" - Delete "$INSTDIR\bin\libsinfg-0.dll" - RMDir "$INSTDIR" -SectionEnd - - diff --git a/synfig-core/trunk/src/synfig/smartfile.h b/synfig-core/trunk/src/synfig/smartfile.h index 25d2de3..92ae3c7 100644 --- a/synfig-core/trunk/src/synfig/smartfile.h +++ b/synfig-core/trunk/src/synfig/smartfile.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file smartfile.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SMARTFILE_H -#define __SINFG_SMARTFILE_H +#ifndef __SYNFIG_SMARTFILE_H +#define __SYNFIG_SMARTFILE_H /* === H E A D E R S ======================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct _FILE_deleter { @@ -44,7 +44,7 @@ struct _FILE_deleter typedef etl::smart_ptr SmartFILE; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/string.h b/synfig-core/trunk/src/synfig/string.h index 58d8bec..4d9a0e5 100644 --- a/synfig-core/trunk/src/synfig/string.h +++ b/synfig-core/trunk/src/synfig/string.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file string.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STRING_H -#define __SINFG_STRING_H +#ifndef __SYNFIG_STRING_H +#define __SYNFIG_STRING_H /* === H E A D E R S ======================================================= */ @@ -46,7 +46,7 @@ typedef basic_string,allocator > string; }; // END of namespace std */ -namespace sinfg +namespace synfig { /*! \typedef String @@ -54,7 +54,7 @@ namespace sinfg */ typedef std::string String; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/string_decl.h b/synfig-core/trunk/src/synfig/string_decl.h index 17cbd61..135f0a1 100644 --- a/synfig-core/trunk/src/synfig/string_decl.h +++ b/synfig-core/trunk/src/synfig/string_decl.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file string_decl.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STRING_DECL_H -#define __SINFG_STRING_DECL_H +#ifndef __SYNFIG_STRING_DECL_H +#define __SYNFIG_STRING_DECL_H /* === H E A D E R S ======================================================= */ @@ -42,7 +42,7 @@ typedef basic_string,allocator > string; }; // END of namespace std -namespace sinfg +namespace synfig { /*! \typedef String @@ -50,7 +50,7 @@ namespace sinfg */ typedef std::string String; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp index fb905b7..37037b2 100644 --- a/synfig-core/trunk/src/synfig/surface.cpp +++ b/synfig-core/trunk/src/synfig/surface.cpp @@ -1,5 +1,5 @@ /* ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: surface.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ ** @@ -20,7 +20,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -40,7 +40,7 @@ #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -48,7 +48,7 @@ using namespace etl; /* === G L O B A L S ======================================================= */ -class target2surface : public sinfg::Target_Scanline +class target2surface : public synfig::Target_Scanline { public: Surface *surface; @@ -57,9 +57,9 @@ public: target2surface(Surface *surface); virtual ~target2surface(); - virtual bool set_rend_desc(sinfg::RendDesc *newdesc); + virtual bool set_rend_desc(synfig::RendDesc *newdesc); - virtual bool start_frame(sinfg::ProgressCallback *cb); + virtual bool start_frame(synfig::ProgressCallback *cb); virtual void end_frame(); @@ -77,16 +77,16 @@ target2surface::~target2surface() } bool -target2surface::set_rend_desc(sinfg::RendDesc *newdesc) +target2surface::set_rend_desc(synfig::RendDesc *newdesc) { assert(newdesc); assert(surface); desc=*newdesc; - return sinfg::Target_Scanline::set_rend_desc(newdesc); + return synfig::Target_Scanline::set_rend_desc(newdesc); } bool -target2surface::start_frame(sinfg::ProgressCallback *cb) +target2surface::start_frame(synfig::ProgressCallback *cb) { if(surface->get_w() != desc.get_w() || surface->get_h() != desc.get_h()) { @@ -118,13 +118,13 @@ target2surface::end_scanline() /* === M E T H O D S ======================================================= */ Target_Scanline::Handle -sinfg::surface_target(Surface *surface) +synfig::surface_target(Surface *surface) { return Target_Scanline::Handle(new target2surface(surface)); } void -sinfg::Surface::clear() +synfig::Surface::clear() { #ifdef HAS_VIMAGE fill(Color(0.5,0.5,0.5,0.0000001)); @@ -134,7 +134,7 @@ sinfg::Surface::clear() } void -sinfg::Surface::blit_to(alpha_pen& pen, int x, int y, int w, int h) +synfig::Surface::blit_to(alpha_pen& pen, int x, int y, int w, int h) { static const float epsilon(0.00001); const float alpha(pen.get_alpha()); diff --git a/synfig-core/trunk/src/synfig/surface.h b/synfig-core/trunk/src/synfig/surface.h index 976b159..e997716 100644 --- a/synfig-core/trunk/src/synfig/surface.h +++ b/synfig-core/trunk/src/synfig/surface.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file surface.h ** \brief Surface and Pen Definitions ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SURFACE_H -#define __SINFG_SURFACE_H +#ifndef __SYNFIG_SURFACE_H +#define __SYNFIG_SURFACE_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Target; class Target_Scanline; @@ -151,7 +151,7 @@ public: //! Creates a target that will render to \a surface etl::handle surface_target(Surface *surface); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/surfacenew.cpp b/synfig-core/trunk/src/synfig/surfacenew.cpp index 42814f6..be02b63 100644 --- a/synfig-core/trunk/src/synfig/surfacenew.cpp +++ b/synfig-core/trunk/src/synfig/surfacenew.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file surfacenew.cpp ** \brief Template File ** @@ -38,7 +38,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/surfacenew.h b/synfig-core/trunk/src/synfig/surfacenew.h index 173baca..0fcafe7 100644 --- a/synfig-core/trunk/src/synfig/surfacenew.h +++ b/synfig-core/trunk/src/synfig/surfacenew.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file surfacenew.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_SURFACENEW_H -#define __SINFG_SURFACENEW_H +#ifndef __SYNFIG_SURFACENEW_H +#define __SYNFIG_SURFACENEW_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Surface; class SurfaceChannelLock; @@ -392,7 +392,7 @@ public: }; // END of class ChannelLock -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/synfig.h b/synfig-core/trunk/src/synfig/synfig.h new file mode 100644 index 0000000..7d6b013 --- /dev/null +++ b/synfig-core/trunk/src/synfig/synfig.h @@ -0,0 +1,137 @@ +/* === S Y N F I G ========================================================= */ +/*! \file synfig.h +** \brief Primary Header for Synfig +** +** $Id: synfig.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +** +** \legal +** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** +** This software and associated documentation +** are CONFIDENTIAL and PROPRIETARY property of +** the above-mentioned copyright holder. +** +** You may not copy, print, publish, or in any +** other way distribute this software without +** a prior written agreement with +** the copyright holder. +** \endlegal +*/ +/* ========================================================================= */ + +/* === S T A R T =========================================================== */ + +#ifndef __SYNFIG__ +#define __SYNFIG__ + +#ifndef __cplusplus +#error Sorry, Synfig only supports C++ at this time. See README for details. +#endif + +#warning The use of this header is deprecated. Please use the individual header files. + +/* === M A C R O S ========================================================= */ + +/*! \def SYNFIG_LEAN +** \brief Define this to remove unused features, speeding up compile time. +** +** Define SYNFIG_LEAN if your plug-in +** or program doesn't use the synfig::Angle class +** or the rendering subsystem. This can speed up +** compiles. You may also wish to individualy +** use the macros SYNFIG_NO_ANGLE and +** SYNFIG_NO_RENDER. +** \see SYNFIG_NO_ANGLE, SYNFIG_NO_RENDER +*/ +#ifdef SYNFIG_LEAN +# ifndef SYNFIG_NO_ANGLE +# define SYNFIG_NO_ANGLE +# endif +# ifndef SYNFIG_NO_RENDER +# define SYNFIG_NO_RENDER +# endif +#endif + +/*! \def SYNFIG_LAYER +** The SYNFIG_LAYER macro is useful for when you +** are compiling layers, and can help to improve +** build time. +*/ +#ifdef SYNFIG_LAYER +# ifndef SYNFIG_NO_RENDER +# define SYNFIG_NO_RENDER +# endif +# define SYNFIG_NO_LOADSAVE +#endif + +/*! \def SYNFIG_TARGET +** The SYNFIG_TARGET macro is useful for when you +** are compiling render targets, and can help to +** improve build time. +*/ +#ifdef SYNFIG_TARGET +# ifdef SYNFIG_NO_RENDER +# error You defined SYNFIG_TARGET, but also SYNFIG_NO_RENDER. This doesnt make sense. +# endif +# ifndef SYNFIG_NO_ANGLE +# define SYNFIG_NO_ANGLE +# endif +# define SYNFIG_NO_LOADSAVE +#endif + +/*! \def SYNFIG_MODULE +** \todo Writeme +*/ +#ifdef SYNFIG_MODULE +# define SYNFIG_NO_LOADSAVE +#endif + +/*! \namespace synfig +** \brief Where every function and class of the synfig library can be found +** \todo Writeme +*/ + +/* === H E A D E R S ======================================================= */ + +#include "version.h" +#include "general.h" +#include "module.h" +#include "color.h" +#include "canvas.h" +#include "layer.h" +#include "vector.h" +#include "types.h" +#include "segment.h" + +#ifndef SYNFIG_NO_RENDER +# include "render.h" +#endif + +#ifndef SYNFIG_LAYER +#include "target.h" +#endif + +#include "valuenode.h" +#include "valuenode_subtract.h" +//#include "valuenode_animated.h" +#include "valuenode_composite.h" +#include "valuenode_const.h" +#include "valuenode_linear.h" +#include "valuenode_dynamiclist.h" +#include "valuenode_reference.h" + +#ifndef SYNFIG_NO_LOADSAVE +# include "savecanvas.h" +# include "loadcanvas.h" +#endif + +#include "importer.h" +#include "surface.h" + +#include "string.h" + +/* === C L A S S E S & S T R U C T S ======================================= */ + +/* === E N D =============================================================== */ + +#endif diff --git a/synfig-core/trunk/src/synfig/synfig.nsh b/synfig-core/trunk/src/synfig/synfig.nsh new file mode 100644 index 0000000..46c591a --- /dev/null +++ b/synfig-core/trunk/src/synfig/synfig.nsh @@ -0,0 +1,19 @@ +; The stuff to install +Section "Synfig Core" + + SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\bin" + + ; Put file there + File "src\synfig\.libs\libsynfig-0.dll" + +SectionEnd + +Section "un.Synfig Core" + Delete "$INSTDIR\bin\libsynfig-0.dll" + RMDir "$INSTDIR" +SectionEnd + + diff --git a/synfig-core/trunk/src/synfig/target.cpp b/synfig-core/trunk/src/synfig/target.cpp index 5fb1790..23cdc92 100644 --- a/synfig-core/trunk/src/synfig/target.cpp +++ b/synfig-core/trunk/src/synfig/target.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target.cpp ** \brief Target Class Implementation ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef HAVE_CONFIG_H # include @@ -33,29 +33,29 @@ #include "target_null.h" #include "target_null_tile.h" -using namespace sinfg; +using namespace synfig; using namespace etl; using namespace std; -sinfg::Target::Book* sinfg::Target::book_; -sinfg::Target::ExtBook* sinfg::Target::ext_book_; +synfig::Target::Book* synfig::Target::book_; +synfig::Target::ExtBook* synfig::Target::ext_book_; -static sinfg::Gamma* default_gamma_; +static synfig::Gamma* default_gamma_; /* === P R O C E D U R E S ================================================= */ bool Target::subsys_init() { - book_=new sinfg::Target::Book(); - ext_book_=new sinfg::Target::ExtBook(); + book_=new synfig::Target::Book(); + ext_book_=new synfig::Target::ExtBook(); - default_gamma_=new sinfg::Gamma(1.0/2.2); + default_gamma_=new synfig::Gamma(1.0/2.2); //default_gamma_->set_black_level(0.05); // Default to 5% black level. - book()["null"]=std::pair(Target_Null::create,"null"); + book()["null"]=std::pair(Target_Null::create,"null"); ext_book()["null"]="null"; - book()["null-tile"]=std::pair(Target_Null_Tile::create,"null-tile"); + book()["null-tile"]=std::pair(Target_Null_Tile::create,"null-tile"); ext_book()["null-tile"]="null-tile"; return true; @@ -93,7 +93,7 @@ Target::Target(): } void -sinfg::Target::set_canvas(Canvas::Handle c) +synfig::Target::set_canvas(Canvas::Handle c) { canvas=c; RendDesc desc=canvas->rend_desc(); diff --git a/synfig-core/trunk/src/synfig/target.h b/synfig-core/trunk/src/synfig/target.h index e2c48cc..9f0e525 100644 --- a/synfig-core/trunk/src/synfig/target.h +++ b/synfig-core/trunk/src/synfig/target.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target.h ** \brief Target Class Implementation ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TARGET_H -#define __SINFG_TARGET_H +#ifndef __SYNFIG_TARGET_H +#define __SYNFIG_TARGET_H /* === H E A D E R S ======================================================= */ @@ -39,28 +39,28 @@ /* === M A C R O S ========================================================= */ //! \writeme -#define SINFG_TARGET_MODULE_EXT public: static const char name__[], version__[], ext__[],cvs_id__[]; static Target *create(const char *filename); +#define SYNFIG_TARGET_MODULE_EXT public: static const char name__[], version__[], ext__[],cvs_id__[]; static Target *create(const char *filename); //! Sets the name of the target -#define SINFG_TARGET_SET_NAME(class,x) const char class::name__[]=x +#define SYNFIG_TARGET_SET_NAME(class,x) const char class::name__[]=x //! \writeme -#define SINFG_TARGET_SET_EXT(class,x) const char class::ext__[]=x +#define SYNFIG_TARGET_SET_EXT(class,x) const char class::ext__[]=x //! Sets the version of the target -#define SINFG_TARGET_SET_VERSION(class,x) const char class::version__[]=x +#define SYNFIG_TARGET_SET_VERSION(class,x) const char class::version__[]=x //! Sets the CVS ID of the target -#define SINFG_TARGET_SET_CVS_ID(class,x) const char class::cvs_id__[]=x +#define SYNFIG_TARGET_SET_CVS_ID(class,x) const char class::cvs_id__[]=x //! \writeme -#define SINFG_TARGET_INIT(class) sinfg::Target* class::create(const char *filename) { return new class(filename); } +#define SYNFIG_TARGET_INIT(class) synfig::Target* class::create(const char *filename) { return new class(filename); } /* === T Y P E D E F S ===================================================== */ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Surface; class RendDesc; @@ -155,7 +155,7 @@ public: static Handle create(const String &type, const String &filename); }; // END of class Target -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/target_multi.cpp b/synfig-core/trunk/src/synfig/target_multi.cpp index 0e22b63..e69eacc 100644 --- a/synfig-core/trunk/src/synfig/target_multi.cpp +++ b/synfig-core/trunk/src/synfig/target_multi.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_multi.cpp ** \brief Template File ** @@ -40,7 +40,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -84,7 +84,7 @@ Target_Multi::init() } bool -Target_Multi::add_frame(const sinfg::Surface *surface) +Target_Multi::add_frame(const synfig::Surface *surface) { return a->add_frame(surface) && b->add_frame(surface); } diff --git a/synfig-core/trunk/src/synfig/target_multi.h b/synfig-core/trunk/src/synfig/target_multi.h index c086d37..e6a4ff4 100644 --- a/synfig-core/trunk/src/synfig/target_multi.h +++ b/synfig-core/trunk/src/synfig/target_multi.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_multi.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TARGET_MULTI_H -#define __SINFG_TARGET_MULTI_H +#ifndef __SYNFIG_TARGET_MULTI_H +#define __SYNFIG_TARGET_MULTI_H /* === H E A D E R S ======================================================= */ @@ -34,7 +34,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Target_Multi ** \brief Render-target @@ -49,7 +49,7 @@ public: Target_Multi(Target_Scanline::Handle a,Target_Scanline::Handle b); virtual ~Target_Multi(); - virtual bool add_frame(const sinfg::Surface *surface); + virtual bool add_frame(const synfig::Surface *surface); virtual bool start_frame(ProgressCallback *cb=NULL); virtual void end_frame(); virtual Color * start_scanline(int scanline); @@ -60,7 +60,7 @@ public: virtual bool init(); }; // END of class Target_Multi -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/target_null.cpp b/synfig-core/trunk/src/synfig/target_null.cpp index 50b97c6..41326e5 100644 --- a/synfig-core/trunk/src/synfig/target_null.cpp +++ b/synfig-core/trunk/src/synfig/target_null.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_null.cpp ** \brief Template File ** @@ -36,7 +36,7 @@ //using namespace std; //using namespace etl; -//using namespace sinfg; +//using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/target_null.h b/synfig-core/trunk/src/synfig/target_null.h index ae95bfc..e64230b 100644 --- a/synfig-core/trunk/src/synfig/target_null.h +++ b/synfig-core/trunk/src/synfig/target_null.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_null.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TARGET_NULL_H -#define __SINFG_TARGET_NULL_H +#ifndef __SYNFIG_TARGET_NULL_H +#define __SYNFIG_TARGET_NULL_H /* === H E A D E R S ======================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Target_Null ** \brief A target which renders to nothing. Useful for benchmarks and other tests. @@ -63,7 +63,7 @@ public: static Target* create(const char *filename=0) { return new Target_Null(); } }; // END of class Target_Null -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/target_null_tile.cpp b/synfig-core/trunk/src/synfig/target_null_tile.cpp index 7e4333f..342521a 100644 --- a/synfig-core/trunk/src/synfig/target_null_tile.cpp +++ b/synfig-core/trunk/src/synfig/target_null_tile.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_null_tile.cpp ** \brief Template File ** @@ -36,7 +36,7 @@ //using namespace std; //using namespace etl; -//using namespace sinfg; +//using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/target_null_tile.h b/synfig-core/trunk/src/synfig/target_null_tile.h index 2d7627c..e0fc86c 100644 --- a/synfig-core/trunk/src/synfig/target_null_tile.h +++ b/synfig-core/trunk/src/synfig/target_null_tile.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_null_tile.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TARGET_NULL_TILE_H -#define __SINFG_TARGET_NULL_TILE_H +#ifndef __SYNFIG_TARGET_NULL_TILE_H +#define __SYNFIG_TARGET_NULL_TILE_H /* === H E A D E R S ======================================================= */ @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Target_Null_Tile ** \brief A target which renders to nothing using tiles. Useful for benchmarks and other tests. @@ -48,7 +48,7 @@ class Target_Null_Tile : public Target_Tile public: ~Target_Null_Tile() { } - virtual bool add_tile(const sinfg::Surface &surface, int x, int y) { return true; } + virtual bool add_tile(const synfig::Surface &surface, int x, int y) { return true; } virtual bool start_frame(ProgressCallback *cb=NULL) { return true; } @@ -58,7 +58,7 @@ public: static Target* create(const char *filename=0) { return new Target_Null_Tile(); } }; // END of class Target_Null_Tile -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/target_scanline.cpp b/synfig-core/trunk/src/synfig/target_scanline.cpp index e1cea2d..5c33cf3 100644 --- a/synfig-core/trunk/src/synfig/target_scanline.cpp +++ b/synfig-core/trunk/src/synfig/target_scanline.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_scanline.cpp ** \brief Template File ** @@ -41,11 +41,11 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ -#define SINFG_OPTIMIZE_LAYER_TREE 1 +#define SYNFIG_OPTIMIZE_LAYER_TREE 1 #define PIXEL_RENDERING_LIMIT 1500000 @@ -96,17 +96,17 @@ Target_Scanline::next_frame(Time& time) time=(time_end-time_start)*curr_frame_/total_frames+time_start; curr_frame_++; -/* sinfg::info("curr_frame_: %d",curr_frame_); - sinfg::info("total_frames: %d",total_frames); - sinfg::info("time_end: %s",time_end.get_string().c_str()); - sinfg::info("time_start: %s",time_start.get_string().c_str()); +/* synfig::info("curr_frame_: %d",curr_frame_); + synfig::info("total_frames: %d",total_frames); + synfig::info("time_end: %s",time_end.get_string().c_str()); + synfig::info("time_start: %s",time_start.get_string().c_str()); */ -// sinfg::info("time: %s",time.get_string().c_str()); +// synfig::info("time: %s",time.get_string().c_str()); return total_frames- curr_frame_+1; } bool -sinfg::Target_Scanline::render(ProgressCallback *cb) +synfig::Target_Scanline::render(ProgressCallback *cb) { SuperCallback super_cb; int @@ -146,7 +146,7 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) // Grab the time int i=next_frame(t); - //sinfg::info("1time_set_to %s",t.get_string().c_str()); + //synfig::info("1time_set_to %s",t.get_string().c_str()); if(i>1) do{ @@ -167,7 +167,7 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) Context context; - #ifdef SINFG_OPTIMIZE_LAYER_TREE + #ifdef SYNFIG_OPTIMIZE_LAYER_TREE Canvas::Handle op_canvas(Canvas::create()); optimize_layers(canvas->get_context(), op_canvas); context=op_canvas->get_context(); @@ -181,12 +181,12 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) { if(threads_<=0) { - if(!sinfg::render(context,this,desc,0)) + if(!synfig::render(context,this,desc,0)) return false; } else { - if(!sinfg::render_threaded(context,this,desc,0,threads_)) + if(!synfig::render_threaded(context,this,desc,0,threads_)) return false; } } @@ -195,7 +195,7 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) #if USE_PIXELRENDERING_LIMIT if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT) { - sinfg::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h()); + synfig::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h()); Surface surface; int rowheight = PIXEL_RENDERING_LIMIT/desc.get_w(); @@ -204,7 +204,7 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) rows++; - sinfg::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows); + synfig::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows); // loop through all the full rows if(!start_frame()) @@ -301,7 +301,7 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) canvas->set_time(t); Context context; - #ifdef SINFG_OPTIMIZE_LAYER_TREE + #ifdef SYNFIG_OPTIMIZE_LAYER_TREE Canvas::Handle op_canvas(Canvas::create()); optimize_layers(canvas->get_context(), op_canvas); context=op_canvas->get_context(); @@ -315,12 +315,12 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) { if(threads_<=0) { - if(!sinfg::render(context,this,desc,cb)) + if(!synfig::render(context,this,desc,cb)) return false; } else { - if(!sinfg::render_threaded(context,this,desc,cb,threads_)) + if(!synfig::render_threaded(context,this,desc,cb,threads_)) return false; } } @@ -329,7 +329,7 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) #if USE_PIXELRENDERING_LIMIT if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT) { - sinfg::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h()); + synfig::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h()); Surface surface; int totalheight = desc.get_h(); @@ -339,7 +339,7 @@ sinfg::Target_Scanline::render(ProgressCallback *cb) rows++; - sinfg::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows); + synfig::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows); // loop through all the full rows if(!start_frame()) diff --git a/synfig-core/trunk/src/synfig/target_scanline.h b/synfig-core/trunk/src/synfig/target_scanline.h index b3aa862..b557713 100644 --- a/synfig-core/trunk/src/synfig/target_scanline.h +++ b/synfig-core/trunk/src/synfig/target_scanline.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_scanline.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TARGET_SCANLINE_H -#define __SINFG_TARGET_SCANLINE_H +#ifndef __SYNFIG_TARGET_SCANLINE_H +#define __SYNFIG_TARGET_SCANLINE_H /* === H E A D E R S ======================================================= */ @@ -34,7 +34,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Target_Scanline ** \brief Render-target @@ -88,11 +88,11 @@ public: int get_threads()const { return threads_; } - bool add_frame(const sinfg::Surface *surface); + bool add_frame(const synfig::Surface *surface); private: }; // END of class Target_Scanline -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp index e8232e2..77b158e 100644 --- a/synfig-core/trunk/src/synfig/target_tile.cpp +++ b/synfig-core/trunk/src/synfig/target_tile.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_tile.cpp ** \brief Template File ** @@ -43,15 +43,15 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ const unsigned int DEF_TILE_WIDTH = 64; const unsigned int DEF_TILE_HEIGHT= 64; -#define SINFG_OPTIMIZE_LAYER_TREE 1 +#define SYNFIG_OPTIMIZE_LAYER_TREE 1 #ifdef _DEBUG -#define SINFG_DISPLAY_EFFICIENCY 1 +#define SYNFIG_DISPLAY_EFFICIENCY 1 #endif /* === G L O B A L S ======================================================= */ @@ -103,12 +103,12 @@ Target_Tile::next_frame(Time& time) time=(time_end-time_start)*curr_frame_/total_frames+time_start; curr_frame_++; -/* sinfg::info("curr_frame_: %d",curr_frame_); - sinfg::info("total_frames: %d",total_frames); - sinfg::info("time_end: %s",time_end.get_string().c_str()); - sinfg::info("time_start: %s",time_start.get_string().c_str()); +/* synfig::info("curr_frame_: %d",curr_frame_); + synfig::info("total_frames: %d",total_frames); + synfig::info("time_end: %s",time_end.get_string().c_str()); + synfig::info("time_start: %s",time_start.get_string().c_str()); */ -// sinfg::info("time: %s",time.get_string().c_str()); +// synfig::info("time: %s",time.get_string().c_str()); return total_frames- curr_frame_+1; } @@ -132,7 +132,7 @@ Target_Tile::next_tile(int& x, int& y) } bool -sinfg::Target_Tile::render_frame_(Context context,ProgressCallback *cb) +synfig::Target_Tile::render_frame_(Context context,ProgressCallback *cb) { if(tile_w_<=0||tile_h_<=0) { @@ -280,16 +280,16 @@ sinfg::Target_Tile::render_frame_(Context context,ProgressCallback *cb) if(cb && !cb->amount_complete(total_tiles,total_tiles)) return false; -#if SINFG_DISPLAY_EFFICIENCY==1 - sinfg::info(">>>>>> Render Time: %fsec, Find Tile Time: %fsec, Add Tile Time: %fsec, Total Time: %fsec",work_time,find_tile_time,add_tile_time,total_time()); - sinfg::info(">>>>>> FRAME EFICIENCY: %f%%",(100.0f*work_time/total_time())); +#if SYNFIG_DISPLAY_EFFICIENCY==1 + synfig::info(">>>>>> Render Time: %fsec, Find Tile Time: %fsec, Add Tile Time: %fsec, Total Time: %fsec",work_time,find_tile_time,add_tile_time,total_time()); + synfig::info(">>>>>> FRAME EFICIENCY: %f%%",(100.0f*work_time/total_time())); #endif #undef total_tiles return true; } bool -sinfg::Target_Tile::render(ProgressCallback *cb) +synfig::Target_Tile::render(ProgressCallback *cb) { SuperCallback super_cb; int @@ -326,7 +326,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb) // Grab the time i=next_frame(t); - //sinfg::info("1time_set_to %s",t.get_string().c_str()); + //synfig::info("1time_set_to %s",t.get_string().c_str()); if(i>=1) { @@ -348,7 +348,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb) Context context; - #ifdef SINFG_OPTIMIZE_LAYER_TREE + #ifdef SYNFIG_OPTIMIZE_LAYER_TREE Canvas::Handle op_canvas(Canvas::create()); optimize_layers(canvas->get_context(), op_canvas); context=op_canvas->get_context(); @@ -357,7 +357,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb) #endif /* - #ifdef SINFG_OPTIMIZE_LAYER_TREE + #ifdef SYNFIG_OPTIMIZE_LAYER_TREE Context context; Canvas::Handle op_canvas(Canvas::create()); // Set the time that we wish to render @@ -376,7 +376,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb) return false; end_frame(); }while((i=next_frame(t))); - //sinfg::info("tilerenderer: i=%d, t=%s",i,t.get_string().c_str()); + //synfig::info("tilerenderer: i=%d, t=%s",i,t.get_string().c_str()); } else { @@ -389,11 +389,11 @@ sinfg::Target_Tile::render(ProgressCallback *cb) // if(!get_avoid_time_sync() || canvas->get_time()!=t) canvas->set_time(t); - //sinfg::info("2time_set_to %s",t.get_string().c_str()); + //synfig::info("2time_set_to %s",t.get_string().c_str()); Context context; - #ifdef SINFG_OPTIMIZE_LAYER_TREE + #ifdef SYNFIG_OPTIMIZE_LAYER_TREE Canvas::Handle op_canvas(Canvas::create()); optimize_layers(canvas->get_context(), op_canvas); context=op_canvas->get_context(); diff --git a/synfig-core/trunk/src/synfig/target_tile.h b/synfig-core/trunk/src/synfig/target_tile.h index c585373..3326ec1 100644 --- a/synfig-core/trunk/src/synfig/target_tile.h +++ b/synfig-core/trunk/src/synfig/target_tile.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_tile.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TARGET_TILE_H -#define __SINFG_TARGET_TILE_H +#ifndef __SYNFIG_TARGET_TILE_H +#define __SYNFIG_TARGET_TILE_H /* === H E A D E R S ======================================================= */ @@ -34,7 +34,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Target_Tile ** \brief Render-target @@ -70,7 +70,7 @@ public: virtual int next_frame(Time& time); //! Adds the tile at \a x , \a y contained in \a surface - virtual bool add_tile(const sinfg::Surface &surface, int x, int y)=0; + virtual bool add_tile(const synfig::Surface &surface, int x, int y)=0; virtual int total_tiles()const { @@ -113,7 +113,7 @@ private: }; // END of class Target_Tile -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp index e225633..ebaacdf 100644 --- a/synfig-core/trunk/src/synfig/time.cpp +++ b/synfig-core/trunk/src/synfig/time.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file time.cpp ** \brief Template File ** @@ -59,7 +59,7 @@ extern "C" { int _isnan(double x); } using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; #define tolower ::tolower @@ -104,7 +104,7 @@ Time::Time(const String &str_, float fps): // to warn about units if the value is zero // it is the only case where units are irrelevant. if(amount!=0) - sinfg::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str()); + synfig::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str()); value_+=amount; return; } @@ -127,7 +127,7 @@ Time::Time(const String &str_, float fps): if(fps) value_+=amount/fps; else - sinfg::warning("Time(): Individual frames referenced, but frame rate is unknown"); + synfig::warning("Time(): Individual frames referenced, but frame rate is unknown"); break; case ':': // try to read it in as a traditional time format @@ -146,12 +146,12 @@ Time::Time(const String &str_, float fps): return; } } - sinfg::warning("Time(): Bad time format"); + synfig::warning("Time(): Bad time format"); break; default: value_+=amount; - sinfg::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str()); + synfig::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str()); break; } pos++; diff --git a/synfig-core/trunk/src/synfig/time.h b/synfig-core/trunk/src/synfig/time.h index ca29908..27ada9f 100644 --- a/synfig-core/trunk/src/synfig/time.h +++ b/synfig-core/trunk/src/synfig/time.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file time.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TIME_H -#define __SINFG_TIME_H +#ifndef __SYNFIG_TIME_H +#define __SYNFIG_TIME_H /* === H E A D E R S ======================================================= */ @@ -34,7 +34,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Time ** \todo writeme @@ -82,16 +82,16 @@ public: Time(const String &string, float fps=0); //! Marks the exclusive negative boundary of time - static const Time begin() { return static_cast(-32767.0f*512.0f); } + static const Time begin() { return static_cast(-32767.0f*512.0f); } //! Marks the exclusive positive boundary of time - static const Time end() { return static_cast(32767.0f*512.0f); } + static const Time end() { return static_cast(32767.0f*512.0f); } //! Marks zero time - static const Time zero() { return static_cast(0); } + static const Time zero() { return static_cast(0); } //! The amount of allowable error in calculations - static const Time epsilon() { return static_cast(epsilon_()); } + static const Time epsilon() { return static_cast(epsilon_()); } //! Returns a string describing the current time value /*! \see Format */ @@ -157,7 +157,7 @@ inline Time::Format operator|(Time::Format lhs, Time::Format rhs) inline bool operator<=(Time::Format lhs, Time::Format rhs) { return (static_cast(lhs) & static_cast(rhs))==static_cast(rhs); } -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/timepointcollect.cpp b/synfig-core/trunk/src/synfig/timepointcollect.cpp index 9300a8a..77212fd 100644 --- a/synfig-core/trunk/src/synfig/timepointcollect.cpp +++ b/synfig-core/trunk/src/synfig/timepointcollect.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.cpp ** \brief Template File ** @@ -40,7 +40,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -52,7 +52,7 @@ using namespace sinfg; //! \writeme int -sinfg::waypoint_collect(set >& waypoint_set,const Time& time, const etl::handle& node) +synfig::waypoint_collect(set >& waypoint_set,const Time& time, const etl::handle& node) { const TimePointSet& timepoint_set(node->get_times()); @@ -133,7 +133,7 @@ sinfg::waypoint_collect(set >& waypoint_set,const //! \writeme int -sinfg::activepoint_collect(set >& activepoint_set,const Time& time, const etl::handle& node) +synfig::activepoint_collect(set >& activepoint_set,const Time& time, const etl::handle& node) { const TimePointSet& timepoint_set(node->get_times()); diff --git a/synfig-core/trunk/src/synfig/timepointcollect.h b/synfig-core/trunk/src/synfig/timepointcollect.h index 8825f25..af40303 100644 --- a/synfig-core/trunk/src/synfig/timepointcollect.h +++ b/synfig-core/trunk/src/synfig/timepointcollect.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file timepointcollect.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TIMEPOINTCOLLECT_H -#define __SINFG_TIMEPOINTCOLLECT_H +#ifndef __SYNFIG_TIMEPOINTCOLLECT_H +#define __SYNFIG_TIMEPOINTCOLLECT_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { //! \writeme int waypoint_collect(std::set >& waypoint_set,const Time& time, const etl::handle& node); @@ -46,7 +46,7 @@ int waypoint_collect(std::set >& waypoint_set,cons //! \writeme int activepoint_collect(std::set >& activepoint_set,const Time& time, const etl::handle& node); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/transform.cpp b/synfig-core/trunk/src/synfig/transform.cpp index 17826f4..291f38e 100644 --- a/synfig-core/trunk/src/synfig/transform.cpp +++ b/synfig-core/trunk/src/synfig/transform.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.cpp ** \brief Template File ** @@ -37,7 +37,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -47,7 +47,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::GUID +synfig::GUID TransformStack::get_guid()const { GUID ret(0); @@ -57,10 +57,10 @@ TransformStack::get_guid()const return ret; } -sinfg::Vector -TransformStack::perform(const sinfg::Vector& x)const +synfig::Vector +TransformStack::perform(const synfig::Vector& x)const { - sinfg::Vector ret(x); + synfig::Vector ret(x); for(const_reverse_iterator iter(rbegin());iter!=rend();++iter) ret=(*iter)->perform(ret); @@ -68,10 +68,10 @@ TransformStack::perform(const sinfg::Vector& x)const return ret; } -sinfg::Vector -TransformStack::unperform(const sinfg::Vector& x)const +synfig::Vector +TransformStack::unperform(const synfig::Vector& x)const { - sinfg::Vector ret(x); + synfig::Vector ret(x); for(const_iterator iter(begin());iter!=end();++iter) ret=(*iter)->unperform(ret); @@ -79,8 +79,8 @@ TransformStack::unperform(const sinfg::Vector& x)const return ret; } -sinfg::Rect -TransformStack::perform(const sinfg::Rect& x)const +synfig::Rect +TransformStack::perform(const synfig::Rect& x)const { Point min(x.get_min()); Point max(x.get_max()); @@ -94,8 +94,8 @@ TransformStack::perform(const sinfg::Rect& x)const return ret; } -sinfg::Rect -TransformStack::unperform(const sinfg::Rect& x)const +synfig::Rect +TransformStack::unperform(const synfig::Rect& x)const { Point min(x.get_min()); Point max(x.get_max()); @@ -109,8 +109,8 @@ TransformStack::unperform(const sinfg::Rect& x)const return ret; } -sinfg::Rect -Transform::perform(const sinfg::Rect& x)const +synfig::Rect +Transform::perform(const synfig::Rect& x)const { if(x.area()>1000000000000.0) return Rect::full_plane(); @@ -128,8 +128,8 @@ Transform::perform(const sinfg::Rect& x)const return ret; } -sinfg::Rect -Transform::unperform(const sinfg::Rect& x)const +synfig::Rect +Transform::unperform(const synfig::Rect& x)const { if(x.area()>1000000000000.0) return Rect::full_plane(); diff --git a/synfig-core/trunk/src/synfig/transform.h b/synfig-core/trunk/src/synfig/transform.h index 61fdd6d..206a0c0 100644 --- a/synfig-core/trunk/src/synfig/transform.h +++ b/synfig-core/trunk/src/synfig/transform.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file transform.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TRANSFORM_H -#define __SINFG_TRANSFORM_H +#ifndef __SYNFIG_TRANSFORM_H +#define __SYNFIG_TRANSFORM_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Transform : public etl::shared_object { @@ -55,11 +55,11 @@ public: const GUID& get_guid()const { return guid_; } virtual ~Transform() { } - virtual sinfg::Vector perform(const sinfg::Vector& x)const=0; - virtual sinfg::Vector unperform(const sinfg::Vector& x)const=0; + virtual synfig::Vector perform(const synfig::Vector& x)const=0; + virtual synfig::Vector unperform(const synfig::Vector& x)const=0; - virtual sinfg::Rect perform(const sinfg::Rect& x)const; - virtual sinfg::Rect unperform(const sinfg::Rect& x)const; + virtual synfig::Rect perform(const synfig::Rect& x)const; + virtual synfig::Rect unperform(const synfig::Rect& x)const; }; // END of class Transform @@ -68,17 +68,17 @@ class TransformStack : public std::list public: GUID get_guid()const; - sinfg::Vector perform(const sinfg::Vector& x)const; - sinfg::Vector unperform(const sinfg::Vector& x)const; + synfig::Vector perform(const synfig::Vector& x)const; + synfig::Vector unperform(const synfig::Vector& x)const; - sinfg::Rect perform(const sinfg::Rect& x)const; - sinfg::Rect unperform(const sinfg::Rect& x)const; + synfig::Rect perform(const synfig::Rect& x)const; + synfig::Rect unperform(const synfig::Rect& x)const; void push(const Transform::Handle& x) { if(x)push_back(x); } void pop() { pop_back(); } }; // END of class TransformStack -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/types.h b/synfig-core/trunk/src/synfig/types.h index d7239a2..d8ab712 100644 --- a/synfig-core/trunk/src/synfig/types.h +++ b/synfig-core/trunk/src/synfig/types.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file types.h ** \brief Template Header ** @@ -21,14 +21,14 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TYPES_H -#define __SINFG_TYPES_H +#ifndef __SYNFIG_TYPES_H +#define __SYNFIG_TYPES_H /* === H E A D E R S ======================================================= */ #include -#ifndef SINFG_NO_ANGLE +#ifndef SYNFIG_NO_ANGLE #include "angle.h" #endif diff --git a/synfig-core/trunk/src/synfig/uniqueid.cpp b/synfig-core/trunk/src/synfig/uniqueid.cpp index 904b83c..60494ef 100644 --- a/synfig-core/trunk/src/synfig/uniqueid.cpp +++ b/synfig-core/trunk/src/synfig/uniqueid.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file uniqueid.cpp ** \brief Template File ** @@ -35,7 +35,7 @@ /* === U S I N G =========================================================== */ using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ @@ -44,7 +44,7 @@ static int uniqueid_pool_(0); /* === M E T H O D S ======================================================= */ int -sinfg::UniqueID::next_id() +synfig::UniqueID::next_id() { return ++uniqueid_pool_; } diff --git a/synfig-core/trunk/src/synfig/uniqueid.h b/synfig-core/trunk/src/synfig/uniqueid.h index c8f396f..72876c9 100644 --- a/synfig-core/trunk/src/synfig/uniqueid.h +++ b/synfig-core/trunk/src/synfig/uniqueid.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file uniqueid.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_UNIQUEID_H -#define __SINFG_UNIQUEID_H +#ifndef __SYNFIG_UNIQUEID_H +#define __SYNFIG_UNIQUEID_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class UniqueIDLessThan; @@ -83,7 +83,7 @@ public: }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/value.cpp b/synfig-core/trunk/src/synfig/value.cpp index b942308..2c97434 100644 --- a/synfig-core/trunk/src/synfig/value.cpp +++ b/synfig-core/trunk/src/synfig/value.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file value.cpp ** \brief Template Header ** @@ -43,7 +43,7 @@ #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; @@ -321,7 +321,7 @@ ValueBase::type_name(Type id) default: break; } - sinfg::warning("Encountered unknown ValueBase with an Type of %d",id); + synfig::warning("Encountered unknown ValueBase with an Type of %d",id); // assert(0); return "UNKNOWN"; } diff --git a/synfig-core/trunk/src/synfig/value.h b/synfig-core/trunk/src/synfig/value.h index 6c9ab9c..6370826 100644 --- a/synfig-core/trunk/src/synfig/value.h +++ b/synfig-core/trunk/src/synfig/value.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file value.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUE_H -#define __SINFG_VALUE_H +#ifndef __SYNFIG_VALUE_H +#define __SYNFIG_VALUE_H /* === H E A D E R S ======================================================= */ @@ -40,7 +40,7 @@ #include "blinepoint.h" #include "exception.h" -#ifndef SINFG_NO_ANGLE +#ifndef SYNFIG_NO_ANGLE #include "angle.h" #endif @@ -52,7 +52,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Canvas; class Vector; @@ -337,7 +337,7 @@ public: operator half()const { return get(Real()); } #endif -#ifndef SINFG_NO_ANGLE +#ifndef SYNFIG_NO_ANGLE operator const Angle&()const { return get(Angle()); } static const Type get_type(const Angle&) { return TYPE_ANGLE; } #endif @@ -447,7 +447,7 @@ public: }; // END of class Value */ -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index 5358530..f1df7ca 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file value_node.cpp ** \brief Template File ** @@ -21,7 +21,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE //#define HAS_HASH_MAP 1 @@ -61,7 +61,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -73,7 +73,7 @@ static LinkableValueNode::Book *book_; ValueNode::LooseHandle -sinfg::find_value_node(const GUID& guid) +synfig::find_value_node(const GUID& guid) { return guid_cast(guid); } @@ -117,23 +117,23 @@ ValueNode::subsys_stop() /* if(global_value_node_map.size() || value_node_count) { if(value_node_count) - sinfg::error("%d ValueNodes haven't been destroyed yet!",value_node_count); + synfig::error("%d ValueNodes haven't been destroyed yet!",value_node_count); if(global_value_node_map.size()!=value_node_count) - sinfg::error("value node count mismatch! map.size()!=value_node_count (%d!=%d)",global_value_node_map.size(),value_node_count); + synfig::error("value node count mismatch! map.size()!=value_node_count (%d!=%d)",global_value_node_map.size(),value_node_count); GlobalValueNodeMap::iterator iter; for(iter=global_value_node_map.begin();iter!=global_value_node_map.end();++iter) { if(!iter->second->is_exported()) - sinfg::info("%s: count:%d name:%s type:%s", + synfig::info("%s: count:%d name:%s type:%s", iter->first.get_string().c_str(), iter->second->count(), iter->second->get_name().c_str(), ValueBase::type_name(iter->second->get_type()).c_str() ); else - sinfg::info("%s: id:%s count:%d name:%s type:%s", + synfig::info("%s: id:%s count:%d name:%s type:%s", iter->first.get_string().c_str(), iter->second->get_id().c_str(), iter->second->count(), diff --git a/synfig-core/trunk/src/synfig/valuenode.h b/synfig-core/trunk/src/synfig/valuenode.h index a9d9f89..670042d 100644 --- a/synfig-core/trunk/src/synfig/valuenode.h +++ b/synfig-core/trunk/src/synfig/valuenode.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_H -#define __SINFG_VALUENODE_H +#ifndef __SYNFIG_VALUENODE_H +#define __SYNFIG_VALUENODE_H /* === H E A D E R S ======================================================= */ @@ -36,7 +36,7 @@ #include #include "guid.h" -#ifndef SINFG_NO_ANGLE +#ifndef SYNFIG_NO_ANGLE #include #endif @@ -62,7 +62,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class Canvas; class LinkableValueNode; @@ -71,7 +71,7 @@ class Layer; /*! \class ValueNode ** \todo writeme */ -class ValueNode : public sinfg::Node +class ValueNode : public synfig::Node { friend class Layer; friend class LinkableValueNode; @@ -379,7 +379,7 @@ public: ValueNode::LooseHandle find_value_node(const GUID& guid); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.cpp b/synfig-core/trunk/src/synfig/valuenode_animated.cpp index 85ee428..b68149a 100644 --- a/synfig-core/trunk/src/synfig/valuenode_animated.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_animated.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_animated.cpp ** \brief Template File ** @@ -56,7 +56,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -173,7 +173,7 @@ struct is_angle_type /* === C L A S S E S ======================================================= */ template -class _Hermite : public sinfg::ValueNode_Animated +class _Hermite : public synfig::ValueNode_Animated { public: typedef T value_type; @@ -394,7 +394,7 @@ public: //value_type vect=(value_type)(Pn-Pc); // Debugging stuff - //sinfg::info("%d:t1: %s",i,tangent_info(Pp,Pn,vect).c_str()); + //synfig::info("%d:t1: %s",i,tangent_info(Pp,Pn,vect).c_str()); // Adjust for time //vect=value_type(vect*(curve.second.get_dt()*2.0)/(curve.second.get_dt()+curve_list.back().second.get_dt())); @@ -436,7 +436,7 @@ public: //value_type vect=(value_type)(Pc-Pp); // Debugging stuff - //sinfg::info("%d:t2: %s",i,tangent_info(Pp,Pn,vect).c_str()); + //synfig::info("%d:t2: %s",i,tangent_info(Pp,Pn,vect).c_str()); // Adjust for time //vect=value_type(vect*(curve.second.get_dt()*2.0)/(curve.second.get_dt()+(after_next->get_time()-next->get_time()))); @@ -507,7 +507,7 @@ public: template -class _Constant : public sinfg::ValueNode_Animated +class _Constant : public synfig::ValueNode_Animated { public: typedef T value_type; @@ -605,7 +605,7 @@ public: } }; -class _AnimBool : public sinfg::ValueNode_Animated +class _AnimBool : public synfig::ValueNode_Animated { public: typedef bool value_type; @@ -855,8 +855,8 @@ ValueNode_Animated::new_waypoint_at_time(const Time& time)const } waypoint.set_time(time); waypoint.set_parent_value_node(const_cast(this)); -// sinfg::info("waypoint.get_after()=set to %d",waypoint.get_after()); -// sinfg::info("waypoint.get_before()=set to %d",waypoint.get_before()); +// synfig::info("waypoint.get_after()=set to %d",waypoint.get_after()); +// synfig::info("waypoint.get_before()=set to %d",waypoint.get_before()); return waypoint; } @@ -1006,7 +1006,7 @@ ValueNode_Animated::set_type(ValueBase::Type t) } ValueNode_Animated::Handle -sinfg::ValueNode_Animated::create(ValueBase::Type type) +synfig::ValueNode_Animated::create(ValueBase::Type type) { switch(type) { @@ -1033,7 +1033,7 @@ sinfg::ValueNode_Animated::create(ValueBase::Type type) return ValueNode_Animated::Handle(new _Constant); default: throw - Exception::BadType(strprintf(_("%s: You cannot use a %s in an animated ValueNode"),"sinfg::ValueNode_Animated::create()", + Exception::BadType(strprintf(_("%s: You cannot use a %s in an animated ValueNode"),"synfig::ValueNode_Animated::create()", ValueBase::type_name(type).c_str()) ); break; diff --git a/synfig-core/trunk/src/synfig/valuenode_animated.h b/synfig-core/trunk/src/synfig/valuenode_animated.h index 97351bd..87444c4 100644 --- a/synfig-core/trunk/src/synfig/valuenode_animated.h +++ b/synfig-core/trunk/src/synfig/valuenode_animated.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_animated.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_ANIMATED_H -#define __SINFG_VALUENODE_ANIMATED_H +#ifndef __SYNFIG_VALUENODE_ANIMATED_H +#define __SYNFIG_VALUENODE_ANIMATED_H /* === H E A D E R S ======================================================= */ @@ -36,7 +36,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct ValueNode_Animated : public ValueNode { @@ -44,8 +44,8 @@ public: typedef etl::handle Handle; typedef etl::handle ConstHandle; - typedef sinfg::Waypoint Waypoint; - typedef sinfg::WaypointList WaypointList; + typedef synfig::Waypoint Waypoint; + typedef synfig::WaypointList WaypointList; typedef std::pair findresult; typedef std::pair const_findresult; @@ -109,7 +109,7 @@ public: DCAST_HACK_ID(4); }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.cpp b/synfig-core/trunk/src/synfig/valuenode_bline.cpp index c8259fc..f97d3c9 100644 --- a/synfig-core/trunk/src/synfig/valuenode_bline.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_bline.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_bline.cpp ** \brief Template File ** @@ -47,7 +47,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -74,7 +74,7 @@ radial_interpolation(const Vector& a, const Vector& b, float c) ValueBase -sinfg::convert_bline_to_segment_list(const ValueBase& bline) +synfig::convert_bline_to_segment_list(const ValueBase& bline) { std::vector ret; @@ -117,7 +117,7 @@ sinfg::convert_bline_to_segment_list(const ValueBase& bline) } ValueBase -sinfg::convert_bline_to_width_list(const ValueBase& bline) +synfig::convert_bline_to_width_list(const ValueBase& bline) { std::vector ret; // std::vector list(bline.operator std::vector()); @@ -266,7 +266,7 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin) ValueNode_BLine::ListEntry ret; - sinfg::BLinePoint prev,next; + synfig::BLinePoint prev,next; int prev_i,next_i; @@ -282,7 +282,7 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin) next_i=index; prev_i=find_prev_valid_entry(index,time); - sinfg::info("index=%d, next_i=%d, prev_i=%d",index,next_i,prev_i); + synfig::info("index=%d, next_i=%d, prev_i=%d",index,next_i,prev_i); next=(*list[next_i].value_node)(time); prev=(*list[prev_i].value_node)(time); @@ -290,7 +290,7 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin) etl::hermite curve(prev.get_vertex(),next.get_vertex(),prev.get_tangent2(),next.get_tangent1()); etl::derivative< etl::hermite > deriv(curve); - sinfg::BLinePoint bline_point; + synfig::BLinePoint bline_point; bline_point.set_vertex(curve(origin)); bline_point.set_width((next.get_width()-prev.get_width())*origin+prev.get_width()); bline_point.set_tangent1(deriv(origin)*min(1.0-origin,origin)); @@ -482,8 +482,8 @@ ValueNode_BLine::operator()(Time t)const float prev_tangent_scalar(1.0f); float next_tangent_scalar(1.0f); - //sinfg::info("index_%d:dist_from_begin=%d",index,dist_from_begin); - //sinfg::info("index_%d:dist_from_end=%d",index,dist_from_end); + //synfig::info("index_%d:dist_from_begin=%d",index,dist_from_begin); + //synfig::info("index_%d:dist_from_end=%d",index,dist_from_end); // If we are the next to the begin if(begin_iter==--std::vector::const_iterator(iter) || dist_from_begin==1) @@ -729,10 +729,10 @@ ValueNode_BLine::operator()(Time t)const */ if(list.empty()) - sinfg::warning(string("ValueNode_BLine::operator()():")+_("No entries in list")); + synfig::warning(string("ValueNode_BLine::operator()():")+_("No entries in list")); else if(ret_list.empty()) - sinfg::warning(string("ValueNode_BLine::operator()():")+_("No entries in ret_list")); + synfig::warning(string("ValueNode_BLine::operator()():")+_("No entries in ret_list")); return ValueBase(ret_list,get_loop()); } diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.h b/synfig-core/trunk/src/synfig/valuenode_bline.h index b88ba86..9784a67 100644 --- a/synfig-core/trunk/src/synfig/valuenode_bline.h +++ b/synfig-core/trunk/src/synfig/valuenode_bline.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_bline.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_BLINE_H -#define __SINFG_VALUENODE_BLINE_H +#ifndef __SYNFIG_VALUENODE_BLINE_H +#define __SYNFIG_VALUENODE_BLINE_H /* === H E A D E R S ======================================================= */ @@ -39,7 +39,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { //! Converts a list of bline points into a list of segments @@ -83,14 +83,14 @@ protected: LinkableValueNode* create_new()const; public: - //using sinfg::LinkableValueNode::set_link_vfunc; + //using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_BLine* create(const ValueBase &x=ValueBase::TYPE_LIST); }; // END of class ValueNode_BLine typedef ValueNode_BLine::ListEntry::ActivepointList ActivepointList; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_composite.cpp b/synfig-core/trunk/src/synfig/valuenode_composite.cpp index 3e03ed6..4b28068 100644 --- a/synfig-core/trunk/src/synfig/valuenode_composite.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_composite.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_composite.cpp ** \brief Template File ** @@ -43,7 +43,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -53,7 +53,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::ValueNode_Composite::ValueNode_Composite(const ValueBase &value): +synfig::ValueNode_Composite::ValueNode_Composite(const ValueBase &value): LinkableValueNode(value.get_type()) { switch(get_type()) @@ -109,7 +109,7 @@ ValueNode_Composite::create_new()const } ValueBase -sinfg::ValueNode_Composite::operator()(Time t)const +synfig::ValueNode_Composite::operator()(Time t)const { switch(get_type()) { @@ -155,7 +155,7 @@ sinfg::ValueNode_Composite::operator()(Time t)const return ret; } default: - sinfg::error(string("ValueNode_Composite::operator():")+_("Bad type for composite")); + synfig::error(string("ValueNode_Composite::operator():")+_("Bad type for composite")); assert(components[0]); return (*components[0])(t); } @@ -175,7 +175,7 @@ ValueNode_Composite::link_count()const case ValueBase::TYPE_BLINEPOINT: return 6; default: - sinfg::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite")); + synfig::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite")); return 1; } } diff --git a/synfig-core/trunk/src/synfig/valuenode_composite.h b/synfig-core/trunk/src/synfig/valuenode_composite.h index 45fad3b..4e2303a 100644 --- a/synfig-core/trunk/src/synfig/valuenode_composite.h +++ b/synfig-core/trunk/src/synfig/valuenode_composite.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_composite.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_COMPOSITE_H -#define __SINFG_VALUENODE_COMPOSITE_H +#ifndef __SYNFIG_VALUENODE_COMPOSITE_H +#define __SYNFIG_VALUENODE_COMPOSITE_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_Composite : public LinkableValueNode { @@ -63,13 +63,13 @@ protected: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::set_link_vfunc; - using sinfg::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_Composite* create(const ValueBase &x); }; // END of class ValueNode_Composite -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_const.cpp b/synfig-core/trunk/src/synfig/valuenode_const.cpp index b412733..56a45f5 100644 --- a/synfig-core/trunk/src/synfig/valuenode_const.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_const.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.cpp ** \brief Template File ** @@ -37,7 +37,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/valuenode_const.h b/synfig-core/trunk/src/synfig/valuenode_const.h index c2a3dca..874c13b 100644 --- a/synfig-core/trunk/src/synfig/valuenode_const.h +++ b/synfig-core/trunk/src/synfig/valuenode_const.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_const.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_CONST_H -#define __SINFG_VALUENODE_CONST_H +#ifndef __SYNFIG_VALUENODE_CONST_H +#define __SYNFIG_VALUENODE_CONST_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_Const : public ValueNode { @@ -68,7 +68,7 @@ protected: virtual void get_times_vfunc(Node::time_set &set) const; }; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp index 198b993..d3fec2d 100644 --- a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_dynamiclist.cpp ** \brief Template File ** @@ -44,7 +44,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -76,7 +76,7 @@ ValueNode_DynamicList::ListEntry::ListEntry(const ValueNode::Handle &value_node, ValueNode_DynamicList::ListEntry::ActivepointList::iterator ValueNode_DynamicList::ListEntry::add(Time time, bool status, int priority) { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator; //! \optimize Activepoint ap(time,status,priority); @@ -92,7 +92,7 @@ ValueNode_DynamicList::ListEntry::add(Time time, bool status, int priority) ValueNode_DynamicList::ListEntry::ActivepointList::iterator ValueNode_DynamicList::ListEntry::add(const Activepoint &x) { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList::iterator iterator; //! \optimize Activepoint ap(x); @@ -137,7 +137,7 @@ ValueNode_DynamicList::create_list_entry(int index, Time time, Real origin) ValueNode_DynamicList::ListEntry ret; - sinfg::ValueBase prev,next; + synfig::ValueBase prev,next; index=index%link_count(); @@ -223,7 +223,7 @@ ValueNode_DynamicList::ListEntry::erase(const UniqueID& x) ValueNode_DynamicList::ListEntry::ActivepointList::iterator ValueNode_DynamicList::ListEntry::find(const Time& x) { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; ActivepointList::iterator iter; @@ -237,7 +237,7 @@ ValueNode_DynamicList::ListEntry::find(const Time& x) ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator ValueNode_DynamicList::ListEntry::find(const Time& x)const { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; ActivepointList::const_iterator iter; @@ -251,7 +251,7 @@ ValueNode_DynamicList::ListEntry::find(const Time& x)const ValueNode_DynamicList::ListEntry::ActivepointList::iterator ValueNode_DynamicList::ListEntry::find_next(const Time& x) { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; ActivepointList::iterator iter; @@ -265,7 +265,7 @@ ValueNode_DynamicList::ListEntry::find_next(const Time& x) ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator ValueNode_DynamicList::ListEntry::find_next(const Time& x)const { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; ActivepointList::const_iterator iter; @@ -279,7 +279,7 @@ ValueNode_DynamicList::ListEntry::find_next(const Time& x)const ValueNode_DynamicList::ListEntry::ActivepointList::iterator ValueNode_DynamicList::ListEntry::find_prev(const Time& x) { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; ActivepointList::iterator iter; iter=timing_info.end(); @@ -297,7 +297,7 @@ ValueNode_DynamicList::ListEntry::find_prev(const Time& x) ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator ValueNode_DynamicList::ListEntry::find_prev(const Time& x)const { - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; ActivepointList::const_iterator iter; iter=timing_info.end(); @@ -349,8 +349,8 @@ ValueNode_DynamicList::ListEntry::find(const Time& begin,const Time& end,std::ve float ValueNode_DynamicList::ListEntry::amount_at_time(const Time &t,bool *rising)const { - typedef sinfg::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; if(timing_info.empty()) return 1.0f; @@ -397,8 +397,8 @@ ValueNode_DynamicList::ListEntry::new_activepoint_at_time(const Time& time)const bool ValueNode_DynamicList::ListEntry::status_at_time(const Time &t)const { - typedef sinfg::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; - typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; + typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint; + typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; ActivepointList::const_iterator entry_iter; ActivepointList::const_iterator prev_iter; @@ -594,16 +594,16 @@ ValueNode_DynamicList::operator()(Time t)const ret_list.push_back((*iter->value_node)(t)); else { - sinfg::warning(string("ValueNode_DynamicList::operator()():")+_("List type/item type mismatch, throwing away mismatch")); + synfig::warning(string("ValueNode_DynamicList::operator()():")+_("List type/item type mismatch, throwing away mismatch")); } } } if(list.empty()) - sinfg::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in list")); + synfig::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in list")); else if(ret_list.empty()) - sinfg::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in ret_list")); + synfig::warning(string("ValueNode_DynamicList::operator()():")+_("No entries in ret_list")); return ret_list; } @@ -749,9 +749,9 @@ ValueNode_DynamicList::find_prev_valid_entry(int orig_item, Time t)const return curr_item; } -const sinfg::Node::time_set & ValueNode_DynamicList::ListEntry::get_times() const +const synfig::Node::time_set & ValueNode_DynamicList::ListEntry::get_times() const { - sinfg::ActivepointList::const_iterator j = timing_info.begin(), + synfig::ActivepointList::const_iterator j = timing_info.begin(), end = timing_info.end(); //must remerge with all the other values because we don't know if we've changed... diff --git a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.h b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.h index 83c6a7b..e2f885d 100644 --- a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.h +++ b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_dynamiclist.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_DYNAMICLIST_H -#define __SINFG_VALUENODE_DYNAMICLIST_H +#ifndef __SYNFIG_VALUENODE_DYNAMICLIST_H +#define __SYNFIG_VALUENODE_DYNAMICLIST_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_BLine; /*! \class ValueNode_DynamicList @@ -52,7 +52,7 @@ class ValueNode_BLine; ** However, it does have it's problems. ** ** The problems arrise when we introduce the concept of a -** Keyframe. Keyframes can be manipulated via the Sinfg +** Keyframe. Keyframes can be manipulated via the Synfig ** Application Library. They allow the user to quickly ** and "automagickly" rearange an animation by moving ** the associated keyframes. With they old way that the @@ -88,7 +88,7 @@ public: friend class ValueNode_DynamicList; friend class ValueNode_BLine; public: - typedef sinfg::Activepoint Activepoint; + typedef synfig::Activepoint Activepoint; typedef std::list ActivepointList; @@ -144,7 +144,7 @@ public: int find(const Time& begin,const Time& end,std::vector& list); - const sinfg::Node::time_set &get_times() const; + const synfig::Node::time_set &get_times() const; const etl::loose_handle &get_parent_value_node()const { return parent_; } @@ -228,8 +228,8 @@ public: ** (which is ValueBase::TYPE_LIST) */ static Handle create(ValueBase::Type id=ValueBase::TYPE_NIL); - using sinfg::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_DynamicList* create_from(const ValueBase &x=ValueBase::TYPE_GRADIENT); }; // END of class ValueNode_DynamicList @@ -237,7 +237,7 @@ public: typedef ValueNode_DynamicList::ListEntry::Activepoint Activepoint; typedef ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_gradientrotate.cpp b/synfig-core/trunk/src/synfig/valuenode_gradientrotate.cpp index 8af3228..6eb1a1f 100644 --- a/synfig-core/trunk/src/synfig/valuenode_gradientrotate.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_gradientrotate.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_gradientrotate.cpp ** \brief Template File ** @@ -40,7 +40,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -50,8 +50,8 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::ValueNode_GradientRotate::ValueNode_GradientRotate(): - LinkableValueNode(sinfg::ValueBase::TYPE_GRADIENT) +synfig::ValueNode_GradientRotate::ValueNode_GradientRotate(): + LinkableValueNode(synfig::ValueBase::TYPE_GRADIENT) { set_link("gradient",ValueNode_Const::create(Gradient())); set_link("offset",ValueNode_Const::create(Real(0))); @@ -71,7 +71,7 @@ ValueNode_GradientRotate::create(const ValueBase& x) if(id!=ValueBase::TYPE_GRADIENT) { assert(0); - throw runtime_error("sinfg::ValueNode_GradientRotate:Bad type "+ValueBase::type_name(id)); + throw runtime_error("synfig::ValueNode_GradientRotate:Bad type "+ValueBase::type_name(id)); } ValueNode_GradientRotate* value_node=new ValueNode_GradientRotate(); @@ -82,13 +82,13 @@ ValueNode_GradientRotate::create(const ValueBase& x) return value_node; } -sinfg::ValueNode_GradientRotate::~ValueNode_GradientRotate() +synfig::ValueNode_GradientRotate::~ValueNode_GradientRotate() { unlink_all(); } bool -sinfg::ValueNode_GradientRotate::set_gradient(ValueNode::Handle a) +synfig::ValueNode_GradientRotate::set_gradient(ValueNode::Handle a) { if(a->get_type()!=ValueBase::TYPE_GRADIENT&& !PlaceholderValueNode::Handle::cast_dynamic(a)) return false; @@ -99,7 +99,7 @@ sinfg::ValueNode_GradientRotate::set_gradient(ValueNode::Handle a) } bool -sinfg::ValueNode_GradientRotate::set_offset(ValueNode::Handle b) +synfig::ValueNode_GradientRotate::set_offset(ValueNode::Handle b) { if(b->get_type()!=ValueBase::TYPE_REAL&& !PlaceholderValueNode::Handle::cast_dynamic(b)) return false; @@ -107,8 +107,8 @@ sinfg::ValueNode_GradientRotate::set_offset(ValueNode::Handle b) return true; } -sinfg::ValueBase -sinfg::ValueNode_GradientRotate::operator()(Time t)const +synfig::ValueBase +synfig::ValueNode_GradientRotate::operator()(Time t)const { Gradient gradient; gradient=(*ref_gradient)(t).get(gradient); diff --git a/synfig-core/trunk/src/synfig/valuenode_gradientrotate.h b/synfig-core/trunk/src/synfig/valuenode_gradientrotate.h index a101758..cd9632d 100644 --- a/synfig-core/trunk/src/synfig/valuenode_gradientrotate.h +++ b/synfig-core/trunk/src/synfig/valuenode_gradientrotate.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_twotone.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_GRADIENTROTATE_H -#define __SINFG_VALUENODE_GRADIENTROTATE_H +#ifndef __SYNFIG_VALUENODE_GRADIENTROTATE_H +#define __SYNFIG_VALUENODE_GRADIENTROTATE_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct ValueNode_GradientRotate : public LinkableValueNode { @@ -88,14 +88,14 @@ protected: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_GradientRotate* create(const ValueBase &x=ValueBase::TYPE_GRADIENT); }; // END of class ValueNode_GradientRotate -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_linear.cpp b/synfig-core/trunk/src/synfig/valuenode_linear.cpp index 625d729..14cc5cc 100644 --- a/synfig-core/trunk/src/synfig/valuenode_linear.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_linear.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_linear.cpp ** \brief Template File ** @@ -38,7 +38,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/valuenode_linear.h b/synfig-core/trunk/src/synfig/valuenode_linear.h index c8e7513..8a1ff13 100644 --- a/synfig-core/trunk/src/synfig/valuenode_linear.h +++ b/synfig-core/trunk/src/synfig/valuenode_linear.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_linear.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_INTERPOLATION_LINEAR_H -#define __SINFG_VALUENODE_INTERPOLATION_LINEAR_H +#ifndef __SYNFIG_VALUENODE_INTERPOLATION_LINEAR_H +#define __SYNFIG_VALUENODE_INTERPOLATION_LINEAR_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_Linear : public LinkableValueNode { @@ -67,14 +67,14 @@ protected: virtual bool set_link_vfunc(int i,ValueNode::Handle x); public: - using sinfg::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_Linear* create(const ValueBase &x); }; // END of class ValueNode_Linear -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp index 8b21fab..6e0a11d 100644 --- a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_radialcomposite.cpp ** \brief Template File ** @@ -39,7 +39,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -49,7 +49,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &value): +synfig::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &value): LinkableValueNode(value.get_type()) { switch(get_type()) @@ -91,7 +91,7 @@ ValueNode_RadialComposite::create_new()const } ValueBase -sinfg::ValueNode_RadialComposite::operator()(Time t)const +synfig::ValueNode_RadialComposite::operator()(Time t)const { switch(get_type()) { @@ -115,7 +115,7 @@ sinfg::ValueNode_RadialComposite::operator()(Time t)const ); } default: - sinfg::error(string("ValueNode_RadialComposite::operator():")+_("Bad type for radialcomposite")); + synfig::error(string("ValueNode_RadialComposite::operator():")+_("Bad type for radialcomposite")); assert(components[0]); return (*components[0])(t); } @@ -131,7 +131,7 @@ ValueNode_RadialComposite::link_count()const case ValueBase::TYPE_COLOR: return 4; default: - sinfg::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite")); + synfig::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite")); return 1; } } diff --git a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.h b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.h index 5236f4e..a907e36 100644 --- a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.h +++ b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_radialcomposite.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_RADIALCOMPOSITE_H -#define __SINFG_VALUENODE_RADIALCOMPOSITE_H +#ifndef __SYNFIG_VALUENODE_RADIALCOMPOSITE_H +#define __SYNFIG_VALUENODE_RADIALCOMPOSITE_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_RadialComposite : public LinkableValueNode { @@ -63,13 +63,13 @@ protected: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::set_link_vfunc; - using sinfg::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_RadialComposite* create(const ValueBase &x); }; // END of class ValueNode_RadialComposite -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_reference.cpp b/synfig-core/trunk/src/synfig/valuenode_reference.cpp index 8349509..c1dbd96 100644 --- a/synfig-core/trunk/src/synfig/valuenode_reference.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_reference.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_reference.cpp ** \brief Template File ** @@ -38,7 +38,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/valuenode_reference.h b/synfig-core/trunk/src/synfig/valuenode_reference.h index 9ea1cee..8013c67 100644 --- a/synfig-core/trunk/src/synfig/valuenode_reference.h +++ b/synfig-core/trunk/src/synfig/valuenode_reference.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_reference.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_REFERENCE_H -#define __SINFG_VALUENODE_REFERENCE_H +#ifndef __SYNFIG_VALUENODE_REFERENCE_H +#define __SYNFIG_VALUENODE_REFERENCE_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_Reference : public LinkableValueNode { @@ -72,12 +72,12 @@ protected: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_Reference* create(const ValueBase &x); }; // END of class ValueNode_Reference -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp index 2911b84..9904d14 100644 --- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_scale.cpp ** \brief Template File ** @@ -44,7 +44,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -54,7 +54,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -ValueNode_Scale::ValueNode_Scale():LinkableValueNode(sinfg::ValueBase::TYPE_NIL) +ValueNode_Scale::ValueNode_Scale():LinkableValueNode(synfig::ValueBase::TYPE_NIL) { set_scalar(1.0); } @@ -78,7 +78,7 @@ ValueNode_Scale::create(const ValueBase& x) break; default: assert(0); - throw runtime_error("sinfg::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type())); + throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type())); } assert(value_node); assert(value_node->get_type()==x.get_type()); @@ -92,7 +92,7 @@ ValueNode_Scale::create_new()const return new ValueNode_Scale(); } -sinfg::ValueNode_Scale::~ValueNode_Scale() +synfig::ValueNode_Scale::~ValueNode_Scale() { unlink_all(); } @@ -150,8 +150,8 @@ ValueNode_Scale::get_value_node()const } -sinfg::ValueBase -sinfg::ValueNode_Scale::operator()(Time t)const +synfig::ValueBase +synfig::ValueNode_Scale::operator()(Time t)const { if(!value_node || !scalar) throw runtime_error(strprintf("ValueNode_Scale: %s",_("One or both of my parameters aren't set!"))); diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.h b/synfig-core/trunk/src/synfig/valuenode_scale.h index 8fe196d..979416e 100644 --- a/synfig-core/trunk/src/synfig/valuenode_scale.h +++ b/synfig-core/trunk/src/synfig/valuenode_scale.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_scale.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_SCALE_H -#define __SINFG_VALUENODE_SCALE_H +#ifndef __SYNFIG_VALUENODE_SCALE_H +#define __SYNFIG_VALUENODE_SCALE_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct ValueNode_Scale : public LinkableValueNode { @@ -89,13 +89,13 @@ protected: virtual LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_Scale* create(const ValueBase &x); }; // END of class ValueNode_Scale -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp index ba7844f..c58bf3e 100644 --- a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_segcalctangent.cpp ** \brief Template File ** @@ -43,7 +43,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.h b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.h index 38ab1ff..0672505 100644 --- a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.h +++ b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_segcalctangent.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_SEGCALCTANGENT_H -#define __SINFG_VALUENODE_SEGCALCTANGENT_H +#ifndef __SYNFIG_VALUENODE_SEGCALCTANGENT_H +#define __SYNFIG_VALUENODE_SEGCALCTANGENT_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_SegCalcTangent : public LinkableValueNode { @@ -69,13 +69,13 @@ protected: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_SegCalcTangent* create(const ValueBase &x=ValueBase::TYPE_VECTOR); }; // END of class ValueNode_SegCalcTangent -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp index 8684f11..57cf589 100644 --- a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_segcalcvertex.cpp ** \brief Template File ** @@ -42,7 +42,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.h b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.h index 43a63e7..5544186 100644 --- a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.h +++ b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_segcalcvertex.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_SEGCALCVERTEX_H -#define __SINFG_VALUENODE_SEGCALCVERTEX_H +#ifndef __SYNFIG_VALUENODE_SEGCALCVERTEX_H +#define __SYNFIG_VALUENODE_SEGCALCVERTEX_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_SegCalcVertex : public LinkableValueNode { @@ -70,13 +70,13 @@ protected: virtual bool set_link_vfunc(int i,ValueNode::Handle x); public: - using sinfg::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_SegCalcVertex* create(const ValueBase &x=ValueBase::TYPE_VECTOR); }; // END of class ValueNode_SegCalcVertex -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_sine.cpp b/synfig-core/trunk/src/synfig/valuenode_sine.cpp index 538a1aa..6dd19a4 100644 --- a/synfig-core/trunk/src/synfig/valuenode_sine.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_sine.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_sine.cpp ** \brief Template File ** @@ -38,7 +38,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/synfig/valuenode_sine.h b/synfig-core/trunk/src/synfig/valuenode_sine.h index 9484c5e..5d0d036 100644 --- a/synfig-core/trunk/src/synfig/valuenode_sine.h +++ b/synfig-core/trunk/src/synfig/valuenode_sine.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_sine.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_SINE_H -#define __SINFG_VALUENODE_SINE_H +#ifndef __SYNFIG_VALUENODE_SINE_H +#define __SYNFIG_VALUENODE_SINE_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode_Sine : public LinkableValueNode { @@ -67,14 +67,14 @@ protected: virtual bool set_link_vfunc(int i,ValueNode::Handle x); public: - using sinfg::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_Sine* create(const ValueBase &x); }; // END of class ValueNode_Sine -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_stripes.cpp b/synfig-core/trunk/src/synfig/valuenode_stripes.cpp index 4849f30..048025f 100644 --- a/synfig-core/trunk/src/synfig/valuenode_stripes.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_stripes.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_subtract.cpp ** \brief Template File ** @@ -41,7 +41,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -51,7 +51,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::ValueNode_Stripes::ValueNode_Stripes():LinkableValueNode(sinfg::ValueBase::TYPE_GRADIENT) +synfig::ValueNode_Stripes::ValueNode_Stripes():LinkableValueNode(synfig::ValueBase::TYPE_GRADIENT) { set_link("color1",ValueNode_Const::create(Color::alpha())); set_link("color2",ValueNode_Const::create(Color::black())); @@ -73,7 +73,7 @@ ValueNode_Stripes::create(const ValueBase& x) if(id!=ValueBase::TYPE_GRADIENT) { assert(0); - throw runtime_error("sinfg::ValueNode_Stripes:Bad type "+ValueBase::type_name(id)); + throw runtime_error("synfig::ValueNode_Stripes:Bad type "+ValueBase::type_name(id)); } ValueNode_Stripes* value_node=new ValueNode_Stripes(); @@ -83,13 +83,13 @@ ValueNode_Stripes::create(const ValueBase& x) return value_node; } -sinfg::ValueNode_Stripes::~ValueNode_Stripes() +synfig::ValueNode_Stripes::~ValueNode_Stripes() { unlink_all(); } bool -sinfg::ValueNode_Stripes::set_color1(ValueNode::Handle a) +synfig::ValueNode_Stripes::set_color1(ValueNode::Handle a) { if(a->get_type()!=ValueBase::TYPE_COLOR) return false; @@ -100,7 +100,7 @@ sinfg::ValueNode_Stripes::set_color1(ValueNode::Handle a) } bool -sinfg::ValueNode_Stripes::set_color2(ValueNode::Handle a) +synfig::ValueNode_Stripes::set_color2(ValueNode::Handle a) { if(a->get_type()!=ValueBase::TYPE_COLOR) return false; @@ -111,7 +111,7 @@ sinfg::ValueNode_Stripes::set_color2(ValueNode::Handle a) } bool -sinfg::ValueNode_Stripes::set_width(ValueNode::Handle x) +synfig::ValueNode_Stripes::set_width(ValueNode::Handle x) { if(x->get_type()!=ValueBase::TYPE_REAL) return false; @@ -122,7 +122,7 @@ sinfg::ValueNode_Stripes::set_width(ValueNode::Handle x) } bool -sinfg::ValueNode_Stripes::set_stripes(ValueNode::Handle b) +synfig::ValueNode_Stripes::set_stripes(ValueNode::Handle b) { if(b->get_type()!=ValueBase::TYPE_INTEGER) return false; @@ -130,8 +130,8 @@ sinfg::ValueNode_Stripes::set_stripes(ValueNode::Handle b) return true; } -sinfg::ValueBase -sinfg::ValueNode_Stripes::operator()(Time t)const +synfig::ValueBase +synfig::ValueNode_Stripes::operator()(Time t)const { const int total((*stripes_)(t).get(int())); int i; diff --git a/synfig-core/trunk/src/synfig/valuenode_stripes.h b/synfig-core/trunk/src/synfig/valuenode_stripes.h index 2039c8a..f1ca295 100644 --- a/synfig-core/trunk/src/synfig/valuenode_stripes.h +++ b/synfig-core/trunk/src/synfig/valuenode_stripes.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_stripes.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_STRIPES_H -#define __SINFG_VALUENODE_STRIPES_H +#ifndef __SYNFIG_VALUENODE_STRIPES_H +#define __SYNFIG_VALUENODE_STRIPES_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct ValueNode_Stripes : public LinkableValueNode { @@ -88,13 +88,13 @@ public: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_Stripes* create(const ValueBase &x=ValueBase::TYPE_GRADIENT); }; // END of class ValueNode_Stripes -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp index e4c55c3..ca31e29 100644 --- a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_subtract.cpp ** \brief Template File ** @@ -43,7 +43,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -53,7 +53,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::ValueNode_Subtract::ValueNode_Subtract():LinkableValueNode(sinfg::ValueBase::TYPE_NIL) +synfig::ValueNode_Subtract::ValueNode_Subtract():LinkableValueNode(synfig::ValueBase::TYPE_NIL) { set_scalar(1.0); } @@ -85,14 +85,14 @@ ValueNode_Subtract::create(const ValueBase& x) break; default: assert(0); - throw runtime_error("sinfg::ValueNode_Subtract:Bad type "+ValueBase::type_name(id)); + throw runtime_error("synfig::ValueNode_Subtract:Bad type "+ValueBase::type_name(id)); } assert(value_node->get_type()==id); return value_node; } -sinfg::ValueNode_Subtract::~ValueNode_Subtract() +synfig::ValueNode_Subtract::~ValueNode_Subtract() { unlink_all(); } @@ -104,7 +104,7 @@ ValueNode_Subtract::set_scalar(Real x) } bool -sinfg::ValueNode_Subtract::set_scalar(ValueNode::Handle x) +synfig::ValueNode_Subtract::set_scalar(ValueNode::Handle x) { if(x->get_type()!=ValueBase::TYPE_REAL&& !PlaceholderValueNode::Handle::cast_dynamic(x)) return false; @@ -113,7 +113,7 @@ sinfg::ValueNode_Subtract::set_scalar(ValueNode::Handle x) } bool -sinfg::ValueNode_Subtract::set_lhs(ValueNode::Handle a) +synfig::ValueNode_Subtract::set_lhs(ValueNode::Handle a) { ref_a=a; @@ -139,7 +139,7 @@ sinfg::ValueNode_Subtract::set_lhs(ValueNode::Handle a) set_type(ValueBase::TYPE_COLOR); else { - sinfg::warning(get_id()+":(set_a):"+strprintf(_("Types seem to be off for ValueNodes %s and %s"),ref_a->get_id().c_str(),ref_b->get_id().c_str())); + synfig::warning(get_id()+":(set_a):"+strprintf(_("Types seem to be off for ValueNodes %s and %s"),ref_a->get_id().c_str(),ref_b->get_id().c_str())); set_type(ValueBase::TYPE_NIL); } @@ -147,7 +147,7 @@ sinfg::ValueNode_Subtract::set_lhs(ValueNode::Handle a) } bool -sinfg::ValueNode_Subtract::set_rhs(ValueNode::Handle b) +synfig::ValueNode_Subtract::set_rhs(ValueNode::Handle b) { ref_b=b; @@ -173,15 +173,15 @@ sinfg::ValueNode_Subtract::set_rhs(ValueNode::Handle b) set_type(ValueBase::TYPE_COLOR); else { - sinfg::warning(get_id()+":(set_b):"+strprintf(_("Types seem to be off for ValueNodes %s and %s"),ref_a->get_id().c_str(),ref_b->get_id().c_str())); + synfig::warning(get_id()+":(set_b):"+strprintf(_("Types seem to be off for ValueNodes %s and %s"),ref_a->get_id().c_str(),ref_b->get_id().c_str())); set_type(ValueBase::TYPE_NIL); } return true; } -sinfg::ValueBase -sinfg::ValueNode_Subtract::operator()(Time t)const +synfig::ValueBase +synfig::ValueNode_Subtract::operator()(Time t)const { if(!ref_a || !ref_b) throw runtime_error(strprintf("ValueNode_Subtract: %s",_("One or both of my parameters aren't set!"))); @@ -201,7 +201,7 @@ sinfg::ValueNode_Subtract::operator()(Time t)const if(get_type()==ValueBase::TYPE_COLOR) return ((*ref_a)(t).get(Color())-(*ref_b)(t).get(Color()))*(*scalar)(t).get(Real()); - sinfg::error(get_id()+':'+strprintf(_("Cannot subtract types of %s and %s"),ValueBase::type_name(ref_a->get_type()).c_str(),ValueBase::type_name(ref_b->get_type()).c_str())); + synfig::error(get_id()+':'+strprintf(_("Cannot subtract types of %s and %s"),ValueBase::type_name(ref_a->get_type()).c_str(),ValueBase::type_name(ref_b->get_type()).c_str())); return ValueBase(); } diff --git a/synfig-core/trunk/src/synfig/valuenode_subtract.h b/synfig-core/trunk/src/synfig/valuenode_subtract.h index 7e2eac1..2bcd08a 100644 --- a/synfig-core/trunk/src/synfig/valuenode_subtract.h +++ b/synfig-core/trunk/src/synfig/valuenode_subtract.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_subtract.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_SUBTRACT_H -#define __SINFG_VALUENODE_SUBTRACT_H +#ifndef __SYNFIG_VALUENODE_SUBTRACT_H +#define __SYNFIG_VALUENODE_SUBTRACT_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct ValueNode_Subtract : public LinkableValueNode { @@ -95,13 +95,13 @@ public: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_Subtract* create(const ValueBase &x=ValueBase()); }; // END of class ValueNode_Subtract -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp index 0f51539..fda0eeb 100644 --- a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_timedswap.cpp ** \brief Template File ** @@ -40,7 +40,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -75,7 +75,7 @@ ValueNode_TimedSwap::create_new()const } -sinfg::ValueNode_TimedSwap::~ValueNode_TimedSwap() +synfig::ValueNode_TimedSwap::~ValueNode_TimedSwap() { unlink_all(); } @@ -171,8 +171,8 @@ ValueNode_TimedSwap::get_swap_length()const -sinfg::ValueBase -sinfg::ValueNode_TimedSwap::operator()(Time t)const +synfig::ValueBase +synfig::ValueNode_TimedSwap::operator()(Time t)const { Time swptime=(*swap_time)(t).get(Time()); Time swplength=(*swap_length)(t).get(Time()); diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.h b/synfig-core/trunk/src/synfig/valuenode_timedswap.h index fff875f..da03170 100644 --- a/synfig-core/trunk/src/synfig/valuenode_timedswap.h +++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_timedswap.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_TIMEDSWAP_H -#define __SINFG_VALUENODE_TIMEDSWAP_H +#ifndef __SYNFIG_VALUENODE_TIMEDSWAP_H +#define __SYNFIG_VALUENODE_TIMEDSWAP_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct ValueNode_TimedSwap : public LinkableValueNode { @@ -86,13 +86,13 @@ protected: virtual LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_TimedSwap* create(const ValueBase &x); }; // END of class ValueNode_TimedSwap -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp index b03ec01..b8febc8 100644 --- a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_subtract.cpp ** \brief Template File ** @@ -41,7 +41,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -51,7 +51,7 @@ using namespace sinfg; /* === M E T H O D S ======================================================= */ -sinfg::ValueNode_TwoTone::ValueNode_TwoTone():LinkableValueNode(sinfg::ValueBase::TYPE_GRADIENT) +synfig::ValueNode_TwoTone::ValueNode_TwoTone():LinkableValueNode(synfig::ValueBase::TYPE_GRADIENT) { set_link("color1",ValueNode_Const::create(Color::black())); set_link("color2",ValueNode_Const::create(Color::white())); @@ -71,7 +71,7 @@ ValueNode_TwoTone::create(const ValueBase& x) if(id!=ValueBase::TYPE_GRADIENT) { assert(0); - throw runtime_error("sinfg::ValueNode_TwoTone:Bad type "+ValueBase::type_name(id)); + throw runtime_error("synfig::ValueNode_TwoTone:Bad type "+ValueBase::type_name(id)); } ValueNode_TwoTone* value_node=new ValueNode_TwoTone(); @@ -81,13 +81,13 @@ ValueNode_TwoTone::create(const ValueBase& x) return value_node; } -sinfg::ValueNode_TwoTone::~ValueNode_TwoTone() +synfig::ValueNode_TwoTone::~ValueNode_TwoTone() { unlink_all(); } bool -sinfg::ValueNode_TwoTone::set_lhs(ValueNode::Handle a) +synfig::ValueNode_TwoTone::set_lhs(ValueNode::Handle a) { if(a->get_type()!=ValueBase::TYPE_COLOR) return false; @@ -98,7 +98,7 @@ sinfg::ValueNode_TwoTone::set_lhs(ValueNode::Handle a) } bool -sinfg::ValueNode_TwoTone::set_rhs(ValueNode::Handle b) +synfig::ValueNode_TwoTone::set_rhs(ValueNode::Handle b) { if(b->get_type()!=ValueBase::TYPE_COLOR) return false; @@ -106,8 +106,8 @@ sinfg::ValueNode_TwoTone::set_rhs(ValueNode::Handle b) return true; } -sinfg::ValueBase -sinfg::ValueNode_TwoTone::operator()(Time t)const +synfig::ValueBase +synfig::ValueNode_TwoTone::operator()(Time t)const { return Gradient((*ref_a)(t).get(Color()),(*ref_b)(t).get(Color())); } diff --git a/synfig-core/trunk/src/synfig/valuenode_twotone.h b/synfig-core/trunk/src/synfig/valuenode_twotone.h index 5d28a83..e80a337 100644 --- a/synfig-core/trunk/src/synfig/valuenode_twotone.h +++ b/synfig-core/trunk/src/synfig/valuenode_twotone.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_twotone.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VALUENODE_TWOTONE_H -#define __SINFG_VALUENODE_TWOTONE_H +#ifndef __SYNFIG_VALUENODE_TWOTONE_H +#define __SYNFIG_VALUENODE_TWOTONE_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { struct ValueNode_TwoTone : public LinkableValueNode { @@ -87,14 +87,14 @@ public: LinkableValueNode* create_new()const; public: - using sinfg::LinkableValueNode::get_link_vfunc; + using synfig::LinkableValueNode::get_link_vfunc; - using sinfg::LinkableValueNode::set_link_vfunc; + using synfig::LinkableValueNode::set_link_vfunc; static bool check_type(ValueBase::Type type); static ValueNode_TwoTone* create(const ValueBase &x=ValueBase::TYPE_GRADIENT); }; // END of class ValueNode_TwoTone -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/vector.h b/synfig-core/trunk/src/synfig/vector.h index a279db8..6a1409e 100644 --- a/synfig-core/trunk/src/synfig/vector.h +++ b/synfig-core/trunk/src/synfig/vector.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file vector.h ** \brief Various discreet type definitions ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VECTOR_H -#define __SINFG_VECTOR_H +#ifndef __SYNFIG_VECTOR_H +#define __SYNFIG_VECTOR_H /* === H E A D E R S ======================================================= */ @@ -51,7 +51,7 @@ extern "C" { int _isnan(double x); } /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { /*! \class Vector ** \todo writeme @@ -180,12 +180,12 @@ typedef Vector Point; -}; // END of namespace sinfg +}; // END of namespace synfig namespace std { -inline sinfg::Vector::value_type -abs(const sinfg::Vector &rhs) +inline synfig::Vector::value_type +abs(const synfig::Vector &rhs) { return rhs.mag(); } }; // END of namespace std @@ -195,14 +195,14 @@ abs(const sinfg::Vector &rhs) _ETL_BEGIN_NAMESPACE template <> -class bezier_base : public std::unary_function +class bezier_base : public std::unary_function { public: - typedef sinfg::Vector value_type; + typedef synfig::Vector value_type; typedef float time_type; private: - bezier_base bezier_x,bezier_y; + bezier_base bezier_x,bezier_y; value_type a,b,c,d; @@ -229,7 +229,7 @@ public: value_type operator()(time_type t)const { - return sinfg::Vector(bezier_x(t),bezier_y(t)); + return synfig::Vector(bezier_x(t),bezier_y(t)); } void evaluate(time_type t, value_type &f, value_type &df) const diff --git a/synfig-core/trunk/src/synfig/version.h b/synfig-core/trunk/src/synfig/version.h index 841a0d6..2870211 100644 --- a/synfig-core/trunk/src/synfig/version.h +++ b/synfig-core/trunk/src/synfig/version.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file version.h ** \brief Template Header ** @@ -21,45 +21,45 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_VERSION_H -#define __SINFG_VERSION_H +#ifndef __SYNFIG_VERSION_H +#define __SYNFIG_VERSION_H /* === H E A D E R S ======================================================= */ /* === M A C R O S ========================================================= */ -/*! \def SINFG_VERSION -** \brief Sinfg API Version +/*! \def SYNFIG_VERSION +** \brief Synfig API Version ** -** The macro SINFG_VERSION can be set to ensure +** The macro SYNFIG_VERSION can be set to ensure ** compile-time compatibility with future versions -** of Sinfg. The first two digits are the major +** of Synfig. The first two digits are the major ** version, the second two digits are the minor ** version, and the last two digits are the ** revision release. */ -#ifndef SINFG_VERSION -#define SINFG_VERSION (006000) +#ifndef SYNFIG_VERSION +#define SYNFIG_VERSION (006000) #endif /*! Increment this value whenever ** the library changes in a way ** that breaks library compatibility */ -#define SINFG_LIBRARY_VERSION 47 +#define SYNFIG_LIBRARY_VERSION 47 /*! \writeme */ -#define SINFG_CHECK_VERSION() sinfg::check_version_(SINFG_LIBRARY_VERSION,sizeof(sinfg::Vector),sizeof(sinfg::Color),sizeof(sinfg::Canvas),sizeof(sinfg::Layer)) +#define SYNFIG_CHECK_VERSION() synfig::check_version_(SYNFIG_LIBRARY_VERSION,sizeof(synfig::Vector),sizeof(synfig::Color),sizeof(synfig::Canvas),sizeof(synfig::Layer)) /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { //! Version checker \internal /*! Checks to make sure that the library ** version matches with what the program ** was compiled against. -** \see SINFG_CHECK_VERSION() +** \see SYNFIG_CHECK_VERSION() */ extern bool check_version_(int v,int vec_size, int color_size,int canvas_size,int layer_size); @@ -69,7 +69,7 @@ extern const char *get_build_date(); extern const char *get_build_time(); -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/waypoint.cpp b/synfig-core/trunk/src/synfig/waypoint.cpp index 2fa82a2..27d3e5d 100644 --- a/synfig-core/trunk/src/synfig/waypoint.cpp +++ b/synfig-core/trunk/src/synfig/waypoint.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file waypoint.cpp ** \brief Template File ** @@ -37,7 +37,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -147,7 +147,7 @@ Waypoint::get_value()const { return (*value_node)(0); } ValueBase Waypoint::get_value(const Time &t)const { return (*value_node)(t); } -sinfg::GUID +synfig::GUID Waypoint::get_guid()const { return GUID::hasher(get_uid()); diff --git a/synfig-core/trunk/src/synfig/waypoint.h b/synfig-core/trunk/src/synfig/waypoint.h index 6315134..f3d482a 100644 --- a/synfig-core/trunk/src/synfig/waypoint.h +++ b/synfig-core/trunk/src/synfig/waypoint.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file waypoint.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_WAYPOINT_H -#define __SINFG_WAYPOINT_H +#ifndef __SYNFIG_WAYPOINT_H +#define __SYNFIG_WAYPOINT_H /* === H E A D E R S ======================================================= */ @@ -41,7 +41,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { +namespace synfig { class ValueNode; class GUID; @@ -58,7 +58,7 @@ class Waypoint : public UniqueID public: - typedef sinfg::Interpolation Interpolation; + typedef synfig::Interpolation Interpolation; class Model { @@ -248,7 +248,7 @@ public: typedef std::vector< Waypoint > WaypointList; -}; // END of namespace sinfg +}; // END of namespace synfig /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/template.cpp b/synfig-core/trunk/src/template.cpp index f493cbd..88d2a1e 100644 --- a/synfig-core/trunk/src/template.cpp +++ b/synfig-core/trunk/src/template.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.cpp ** \brief Template File ** @@ -38,7 +38,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ diff --git a/synfig-core/trunk/src/template.h b/synfig-core/trunk/src/template.h index 81e3105..8f325cf 100644 --- a/synfig-core/trunk/src/template.h +++ b/synfig-core/trunk/src/template.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file template.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TEMPLATE_H -#define __SINFG_TEMPLATE_H +#ifndef __SYNFIG_TEMPLATE_H +#define __SYNFIG_TEMPLATE_H /* === H E A D E R S ======================================================= */ diff --git a/synfig-core/trunk/src/tool/Makefile.am b/synfig-core/trunk/src/tool/Makefile.am index 3d55d51..41b1f23 100644 --- a/synfig-core/trunk/src/tool/Makefile.am +++ b/synfig-core/trunk/src/tool/Makefile.am @@ -1,4 +1,4 @@ -# $Header: /opt/voria/cvs/sinfg/src/tool/Makefile.am,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $ +# $Header: /opt/voria/cvs/synfig/src/tool/Makefile.am,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $ MAINTAINERCLEANFILES=Makefile.in @@ -7,8 +7,8 @@ INCLUDES=-I$(top_srcdir)/src bin_PROGRAMS = synfig synfig_SOURCES = main.cpp -synfig_LDADD = -L../sinfg -lsinfg @SINFG_LIBS@ -synfig_CXXFLAGS = -lsinfg @SINFG_CFLAGS@ +synfig_LDADD = -L../synfig -lsynfig @SYNFIG_LIBS@ +synfig_CXXFLAGS = -lsynfig @SYNFIG_CFLAGS@ #synfig_LDFLAGS=-export-dynamic -dlopen self #-dlopen ../modules/example/libexample.la diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp index 794e0d1..c7120de 100644 --- a/synfig-core/trunk/src/tool/main.cpp +++ b/synfig-core/trunk/src/tool/main.cpp @@ -1,6 +1,6 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file main.cpp -** \brief SINFG Tool +** \brief SYNFIG Tool ** ** $Id: main.cpp,v 1.9 2005/01/23 04:41:10 darco Exp $ ** @@ -34,44 +34,44 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ enum exit_code { - SINFGTOOL_OK =0, - SINFGTOOL_FILENOTFOUND =1, - SINFGTOOL_BORRED =2, - SINFGTOOL_HELP =3, - SINFGTOOL_UNKNOWNARGUMENT =4, - SINFGTOOL_UNKNOWNERROR =5, - SINFGTOOL_INVALIDTARGET =6, - SINFGTOOL_RENDERFAILURE =7, - SINFGTOOL_BLANK =8, - SINFGTOOL_BADVERSION =9 + SYNFIGTOOL_OK =0, + SYNFIGTOOL_FILENOTFOUND =1, + SYNFIGTOOL_BORRED =2, + SYNFIGTOOL_HELP =3, + SYNFIGTOOL_UNKNOWNARGUMENT =4, + SYNFIGTOOL_UNKNOWNERROR =5, + SYNFIGTOOL_INVALIDTARGET =6, + SYNFIGTOOL_RENDERFAILURE =7, + SYNFIGTOOL_BLANK =8, + SYNFIGTOOL_BADVERSION =9 }; #ifndef VERSION #define VERSION "unknown" -#define PACKAGE "sinfg-tool" +#define PACKAGE "synfig-tool" #endif #ifdef DEFAULT_QUALITY @@ -90,7 +90,7 @@ bool print_benchmarks=false; /* === M E T H O D S ======================================================= */ -class Progress : public sinfg::ProgressCallback +class Progress : public synfig::ProgressCallback { const char *program; @@ -126,7 +126,7 @@ public: } }; -class RenderProgress : public sinfg::ProgressCallback +class RenderProgress : public synfig::ProgressCallback { string taskname; @@ -256,7 +256,7 @@ void guid_test() cout<<"GUID Test"<>8)<<'.'<<((__TCPLUSPLUS__&255)>>4)<<'.'<<(__TCPLUSPLUS__&15); #endif - cout<first<get_name()<get_local_name()<get_version()<first<first<first<first<begin() != '-') { //cerr<<*iter->begin()<<"-----------"<c_str()))); @@ -704,7 +704,7 @@ int extract_RendDesc(arg_list_t &arg_list,RendDesc &desc) } if(span) desc.set_span(span); - return SINFGTOOL_OK; + return SYNFIGTOOL_OK; } int extract_quality(arg_list_t &arg_list,int &quality) @@ -722,7 +722,7 @@ int extract_quality(arg_list_t &arg_list,int &quality) } } - return SINFGTOOL_OK; + return SYNFIGTOOL_OK; } int extract_threads(arg_list_t &arg_list,int &threads) @@ -740,7 +740,7 @@ int extract_threads(arg_list_t &arg_list,int &threads) } } - return SINFGTOOL_OK; + return SYNFIGTOOL_OK; } int extract_target(arg_list_t &arg_list,string &type) @@ -759,7 +759,7 @@ int extract_target(arg_list_t &arg_list,string &type) } } - return SINFGTOOL_OK; + return SYNFIGTOOL_OK; } int extract_append(arg_list_t &arg_list,string &filename) @@ -778,13 +778,13 @@ int extract_append(arg_list_t &arg_list,string &filename) } } - return SINFGTOOL_OK; + return SYNFIGTOOL_OK; } int extract_outfile(arg_list_t &arg_list,string &outfile) { arg_list_t::iterator iter, next; - int ret=SINFGTOOL_FILENOTFOUND; + int ret=SYNFIGTOOL_FILENOTFOUND; outfile.clear(); for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++) @@ -795,7 +795,7 @@ int extract_outfile(arg_list_t &arg_list,string &outfile) iter=next++; outfile=*iter; arg_list.erase(iter); - ret=SINFGTOOL_OK; + ret=SYNFIGTOOL_OK; } } @@ -818,7 +818,7 @@ int extract_canvasid(arg_list_t &arg_list,string &canvasid) } } - return SINFGTOOL_OK; + return SYNFIGTOOL_OK; } /* === M E T H O D S ======================================================= */ @@ -834,15 +834,15 @@ int main(int argc, char *argv[]) progname=argv[0]; Progress p(argv[0]); - if(!SINFG_CHECK_VERSION()) + if(!SYNFIG_CHECK_VERSION()) { - cerr<<_("FATAL: Sinfg Version Mismatch")<render(&p)) { cerr<<"Render Failure."<