From 4ba22fb51d97f1ecce04dcc5e40569a4354c1bae Mon Sep 17 00:00:00 2001 From: dooglus Date: Mon, 22 Dec 2008 10:27:00 +0000 Subject: [PATCH] Remove spaces and tabs at end of lines. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2317 1f10aa63-cdf2-0310-b900-c93c546f37ac --- ETL/trunk/ETL/_stringf.h | 2 +- ETL/trunk/ETL/clock | 4 +- ETL/trunk/ETL/ref_count | 2 +- gtkmm-osx/trunk/jpeg-6b/jdct.h | 2 +- gtkmm-osx/trunk/jpeg-6b/jpeglib.h | 28 +++++----- .../trunk/libpng-1.2.5/contrib/visupng/PngFile.h | 2 +- .../trunk/libpng-1.2.5/contrib/visupng/README.txt | 4 +- .../trunk/libpng-1.2.5/contrib/visupng/resource.h | 2 +- gtkmm-osx/trunk/libpng-1.2.5/pngconf.h | 20 ++++---- .../trunk/libpng-1.2.5/projects/borland/libpng.cpp | 1 - .../trunk/libpng-1.2.5/projects/borland/zlib.cpp | 1 - .../trunk/libpng-1.2.5/projects/msvc/README.txt | 10 ++-- synfig-core/trunk/doc/hw-gfx-mapping.txt | 6 +-- synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp | 2 +- synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp | 2 +- synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp | 12 ++--- .../trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp | 12 ++--- .../trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp | 10 ++-- .../trunk/src/modules/mod_geometry/checkerboard.h | 2 +- .../trunk/src/modules/mod_geometry/outline.cpp | 2 +- .../modules/mod_imagemagick/mptr_imagemagick.cpp | 10 ++-- .../modules/mod_imagemagick/trgt_imagemagick.cpp | 8 +-- .../trunk/src/modules/mod_libavcodec/trgt_av.cpp | 4 +- .../trunk/src/modules/mod_magickpp/trgt_magickpp.h | 6 +-- synfig-core/trunk/src/modules/mod_mng/trgt_mng.cpp | 18 +++---- synfig-core/trunk/src/modules/mod_mng/trgt_mng.h | 6 +-- synfig-core/trunk/src/modules/mod_png/mptr_png.cpp | 2 +- synfig-core/trunk/src/synfig/loadcanvas.cpp | 2 +- synfig-core/trunk/src/synfig/main.cpp | 2 +- synfig-core/trunk/src/synfig/matrix.h | 60 +++++++++++----------- synfig-core/trunk/src/synfig/nodebase.h | 2 +- synfig-core/trunk/src/synfig/value.cpp | 2 +- synfig-core/trunk/src/synfig/valuenode_bline.cpp | 2 +- synfig-core/trunk/src/synfig/valuenode_log.cpp | 4 +- synfig-core/trunk/src/synfig/valuenode_log.h | 2 +- synfig-osx/trunk/launcher/dri-surface.h | 2 +- synfig-studio/trunk/src/gtkmm/about.cpp | 8 +-- synfig-studio/trunk/src/gtkmm/about.h | 4 +- synfig-studio/trunk/src/gtkmm/app.cpp | 10 ++-- synfig-studio/trunk/src/gtkmm/dialog_setup.cpp | 16 +++--- synfig-studio/trunk/src/gtkmm/dialog_setup.h | 2 +- synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp | 2 +- synfig-studio/trunk/src/gtkmm/instance.cpp | 2 +- synfig-studio/trunk/src/gtkmm/layertree.cpp | 2 +- synfig-studio/trunk/src/gtkmm/state_draw.cpp | 4 +- .../trunk/src/gtkmm/widget_canvaschooser.cpp | 2 +- synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp | 2 +- .../trunk/src/gtkmm/widget_timeslider.cpp | 2 +- synfig-studio/trunk/src/gtkmm/workarea.cpp | 6 +-- .../trunk/src/synfigapp/action_system.cpp | 2 +- .../src/synfigapp/actions/valuedescexport.cpp | 2 +- synfig-studio/trunk/src/synfigapp/blineconvert.cpp | 30 +++++------ 52 files changed, 176 insertions(+), 178 deletions(-) diff --git a/ETL/trunk/ETL/_stringf.h b/ETL/trunk/ETL/_stringf.h index f91cfca..120c326 100644 --- a/ETL/trunk/ETL/_stringf.h +++ b/ETL/trunk/ETL/_stringf.h @@ -92,7 +92,7 @@ vstrprintf(const char *format, va_list args) char *buffer; std::string ret; int i=vasprintf(&buffer,format,args); - if (i>-1) + if (i>-1) { ret=buffer; free(buffer); diff --git a/ETL/trunk/ETL/clock b/ETL/trunk/ETL/clock index 76a694e..04b191e 100644 --- a/ETL/trunk/ETL/clock +++ b/ETL/trunk/ETL/clock @@ -51,7 +51,7 @@ // If we could not find ourselves a better // clock description, go ahead and use the -// standard clock() implementation. +// standard clock() implementation. // (Better than nothing...) #include "_clock_system.h" #ifndef ETL_CLOCK_DEFAULT_DESC_CLASS @@ -80,7 +80,7 @@ _ETL_BEGIN_NAMESPACE #else #warning No realtime clock description found. #endif - + #else class clock : public _ETL::clock_base { }; #ifdef ETL_CLOCK_PROCTIME_DESC_CLASS diff --git a/ETL/trunk/ETL/ref_count b/ETL/trunk/ETL/ref_count index 1df6fc0..4f3bc74 100644 --- a/ETL/trunk/ETL/ref_count +++ b/ETL/trunk/ETL/ref_count @@ -1,7 +1,7 @@ // -*- C++ -*- /*! ======================================================================== ** Extended Template and Library -** +** ** $Id$ ** ** Copyright (c) 2002 Robert B. Quattlebaum Jr. diff --git a/gtkmm-osx/trunk/jpeg-6b/jdct.h b/gtkmm-osx/trunk/jpeg-6b/jdct.h index 04192a2..31054a8 100644 --- a/gtkmm-osx/trunk/jpeg-6b/jdct.h +++ b/gtkmm-osx/trunk/jpeg-6b/jdct.h @@ -8,7 +8,7 @@ * This include file contains common declarations for the forward and * inverse DCT modules. These declarations are private to the DCT managers * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms. - * The individual DCT algorithms are kept in separate files to ease + * The individual DCT algorithms are kept in separate files to ease * machine-dependent tuning (e.g., assembly coding). */ diff --git a/gtkmm-osx/trunk/jpeg-6b/jpeglib.h b/gtkmm-osx/trunk/jpeg-6b/jpeglib.h index d1be8dd..31569a2 100644 --- a/gtkmm-osx/trunk/jpeg-6b/jpeglib.h +++ b/gtkmm-osx/trunk/jpeg-6b/jpeglib.h @@ -128,9 +128,9 @@ typedef struct { /* The decompressor output side may not use these variables. */ int dc_tbl_no; /* DC entropy table selector (0..3) */ int ac_tbl_no; /* AC entropy table selector (0..3) */ - + /* Remaining fields should be treated as private by applications. */ - + /* These values are computed during compression or decompression startup: */ /* Component's size in DCT blocks. * Any dummy blocks added to complete an MCU are not counted; therefore @@ -298,14 +298,14 @@ struct jpeg_compress_struct { jpeg_component_info * comp_info; /* comp_info[i] describes component that appears i'th in SOF */ - + JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS]; /* ptrs to coefficient quantization tables, or NULL if not defined */ - + JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS]; JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS]; /* ptrs to Huffman coding tables, or NULL if not defined */ - + UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */ UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */ UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */ @@ -345,7 +345,7 @@ struct jpeg_compress_struct { UINT16 X_density; /* Horizontal pixel density */ UINT16 Y_density; /* Vertical pixel density */ boolean write_Adobe_marker; /* should an Adobe marker be written? */ - + /* State variable: index of next scanline to be written to * jpeg_write_scanlines(). Application may use this to control its * processing loop, e.g., "while (next_scanline < image_height)". @@ -370,7 +370,7 @@ struct jpeg_compress_struct { * There are v_samp_factor * DCTSIZE sample rows of each component in an * "iMCU" (interleaved MCU) row. */ - + /* * These fields are valid during any one scan. * They describe the components and MCUs actually appearing in the scan. @@ -378,10 +378,10 @@ struct jpeg_compress_struct { int comps_in_scan; /* # of JPEG components in this scan */ jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN]; /* *cur_comp_info[i] describes component that appears i'th in SOS */ - + JDIMENSION MCUs_per_row; /* # of MCUs across the image */ JDIMENSION MCU_rows_in_scan; /* # of MCU rows in the image */ - + int blocks_in_MCU; /* # of DCT blocks per MCU */ int MCU_membership[C_MAX_BLOCKS_IN_MCU]; /* MCU_membership[i] is index in cur_comp_info of component owning */ @@ -652,7 +652,7 @@ struct jpeg_error_mgr { #define JMSG_LENGTH_MAX 200 /* recommended size of format_message buffer */ /* Reset error state variables at start of a new image */ JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo)); - + /* The message ID code and any parameters are saved here. * A message can have one string parameter or up to 8 int parameters. */ @@ -662,11 +662,11 @@ struct jpeg_error_mgr { int i[8]; char s[JMSG_STR_PARM_MAX]; } msg_parm; - + /* Standard state variables for error facility */ - + int trace_level; /* max msg_level that will be displayed */ - + /* For recoverable corrupt-data errors, we emit a warning message, * but keep going unless emit_message chooses to abort. emit_message * should count warnings in num_warnings. The surrounding application @@ -824,7 +824,7 @@ typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo)); /* Short forms of external names for systems with brain-damaged linkers. * We shorten external names to be unique in the first six letters, which * is good enough for all known systems. - * (If your compiler itself needs names to be unique in less than 15 + * (If your compiler itself needs names to be unique in less than 15 * characters, you are out of luck. Get a better compiler.) */ diff --git a/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/PngFile.h b/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/PngFile.h index a900fd4..18acf55 100644 --- a/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/PngFile.h +++ b/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/PngFile.h @@ -14,7 +14,7 @@ void PngFileInitialize (HWND hwnd) ; BOOL PngFileOpenDlg (HWND hwnd, PTSTR pstrFileName, PTSTR pstrTitleName) ; BOOL PngFileSaveDlg (HWND hwnd, PTSTR pstrFileName, PTSTR pstrTitleName) ; -BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, +BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, int *piWidth, int *piHeight, int *piChannels, png_color *pBkgColor); BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData, int iWidth, int iHeight, png_color BkgColor); diff --git a/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/README.txt b/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/README.txt index 4a753d8..5f265cc 100644 --- a/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/README.txt +++ b/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/README.txt @@ -5,8 +5,8 @@ Copyright 2000, Willem van Schaik. For conditions of distribution and use, see the copyright/license/disclaimer notice in png.h As a PNG .dll demo VisualPng is finished. More features would only hinder -the program's objective. However, further extensions (like support for other -graphics formats) are in development. To get these, or for pre-compiled +the program's objective. However, further extensions (like support for other +graphics formats) are in development. To get these, or for pre-compiled binaries, go to "http://www.schaik.com/png/visualpng.html". ------------------------------------------------------------------------ diff --git a/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/resource.h b/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/resource.h index 611dd03..b62176d 100644 --- a/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/resource.h +++ b/gtkmm-osx/trunk/libpng-1.2.5/contrib/visupng/resource.h @@ -12,7 +12,7 @@ #define IDM_HELP_ABOUT 40008 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 113 diff --git a/gtkmm-osx/trunk/libpng-1.2.5/pngconf.h b/gtkmm-osx/trunk/libpng-1.2.5/pngconf.h index 4a425dd..0e94c40 100644 --- a/gtkmm-osx/trunk/libpng-1.2.5/pngconf.h +++ b/gtkmm-osx/trunk/libpng-1.2.5/pngconf.h @@ -80,9 +80,9 @@ * 'Cygwin' defines/defaults: * PNG_BUILD_DLL -- (ignored) building the dll * (no define) -- (ignored) building an application, linking to the dll - * PNG_STATIC -- (ignored) building the static lib, or building an + * PNG_STATIC -- (ignored) building the static lib, or building an * application that links to the static lib. - * ALL_STATIC -- (ignored) building various static libs, or building an + * ALL_STATIC -- (ignored) building various static libs, or building an * application that links to the static libs. * Thus, * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and @@ -95,12 +95,12 @@ * PNG_BUILD_DLL * PNG_STATIC * (nothing) == PNG_USE_DLL - * + * * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent - * of auto-import in binutils, we no longer need to worry about + * of auto-import in binutils, we no longer need to worry about * __declspec(dllexport) / __declspec(dllimport) and friends. Therefore, * we don't need to worry about PNG_STATIC or ALL_STATIC when it comes - * to __declspec() stuff. However, we DO need to worry about + * to __declspec() stuff. However, we DO need to worry about * PNG_BUILD_DLL and PNG_STATIC because those change some defaults * such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed. */ @@ -144,8 +144,8 @@ # if !defined(PNG_DLL) # define PNG_DLL # endif -# endif -# endif +# endif +# endif # endif #endif @@ -640,7 +640,7 @@ # define PNG_EASY_ACCESS_SUPPORTED #endif -/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 +/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */ #if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) # ifndef PNG_ASSEMBLER_CODE_SUPPORTED @@ -1162,7 +1162,7 @@ typedef z_stream FAR * png_zstreamp; # define PNGAPI __cdecl # undef PNG_IMPEXP # define PNG_IMPEXP -#endif +#endif /* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall", * you may get warnings regarding the linkage of png_zalloc and png_zfree. @@ -1317,7 +1317,7 @@ typedef z_stream FAR * png_zstreamp; # define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT 128 /* >= */ #endif #ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT -# define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT 9 /* >= */ +# define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT 9 /* >= */ #endif /* Set this in the makefile for VC++ on Pentium, not here. */ diff --git a/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/libpng.cpp b/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/libpng.cpp index 4e2f274..2708ad4 100644 --- a/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/libpng.cpp +++ b/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/libpng.cpp @@ -26,4 +26,3 @@ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*) return 1; } //--------------------------------------------------------------------------- - \ No newline at end of file diff --git a/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/zlib.cpp b/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/zlib.cpp index 2cef71d..3df1532 100644 --- a/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/zlib.cpp +++ b/gtkmm-osx/trunk/libpng-1.2.5/projects/borland/zlib.cpp @@ -27,4 +27,3 @@ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*) return 1; } //--------------------------------------------------------------------------- - \ No newline at end of file diff --git a/gtkmm-osx/trunk/libpng-1.2.5/projects/msvc/README.txt b/gtkmm-osx/trunk/libpng-1.2.5/projects/msvc/README.txt index c680fd8..d684b6b 100644 --- a/gtkmm-osx/trunk/libpng-1.2.5/projects/msvc/README.txt +++ b/gtkmm-osx/trunk/libpng-1.2.5/projects/msvc/README.txt @@ -12,8 +12,8 @@ To build: 0) On the main menu, select "File | Open Workspace" and then select "libpng.dsw". -1) On the main menu Select "Build | Set Active configuration". - Among the configurations beginning with "libpng" select the +1) On the main menu Select "Build | Set Active configuration". + Among the configurations beginning with "libpng" select the one you wish to build (the corresponding "zlib" configuration will be built automatically). @@ -34,7 +34,7 @@ libpng and zlib libraries: libpng13b.dll (C + Assembler debug version) libpng13d.dll (C code debug version) libpng13vb.dll (version for VB, uses "stdcall" protocol) - libpng13[c,e-m].dll (reserved for official versions) + libpng13[c,e-m].dll (reserved for official versions) libpng13[n-z].dll (available for private versions) zlib.dll (default version, currently C code only) zlibd.dll (debug version) @@ -43,14 +43,14 @@ libpng and zlib libraries: If you change anything in libpng, or select different compiler settings, please change the library name to an unreserved name, and define DLLFNAME_POSTFIX and (PRIVATEBUILD or SPECIALBUILD) accordingly. DLLFNAME_POSTFIX -should correspond to a string in the range of "N" to "Z" depending on the letter +should correspond to a string in the range of "N" to "Z" depending on the letter you choose for your private version. All DLLs built by this project use the Microsoft dynamic C runtime library MSVCRT.DLL (MSVCRTD.DLL for debug versions). If you distribute any of the above mentioned libraries you should also include this DLL in your package. For a list of files that are redistributable in Visual C++ 6.0, see -Common\Redist\Redist.txt on Disc 1 of the Visual C++ 6.0 product CDs. +Common\Redist\Redist.txt on Disc 1 of the Visual C++ 6.0 product CDs. 5) For an example workspace that builds an application using the resulting DLLs, go to Libpng's contrib\msvctest directory and use it to build diff --git a/synfig-core/trunk/doc/hw-gfx-mapping.txt b/synfig-core/trunk/doc/hw-gfx-mapping.txt index 2c98e60..cbb9075 100644 --- a/synfig-core/trunk/doc/hw-gfx-mapping.txt +++ b/synfig-core/trunk/doc/hw-gfx-mapping.txt @@ -13,7 +13,7 @@ Algorithmic - gets colors without sampling textures (exception for function look Sampling - samples a texture map as part of the color calc process. Behind - use result(s) below to calculate color. - Internal - + Internal - Functions/Inputs - CPU generated internal texture maps (uniform) Dependent - GPU generated texture maps (unknown use...) @@ -22,7 +22,7 @@ Parameters: Varying - pixel coordinate (in canv-space), texture coordinates for samplers, etc. For optimized stuff: - For layer constants that aren't simple calculations (i.e. changing the blend type), + For layer constants that aren't simple calculations (i.e. changing the blend type), we can use global constants (however since OpenGL doesn't allow you to define those manually, we can probably do it with #defines or the like)... Just in time compiling (optimized by caching these changes of course) would allow us to operate in an optimal @@ -53,7 +53,7 @@ rectangle - same thing as the checker_board, but only need to worry about 2 edge Coverage Map Based: outline,polygon,region,star,text and Internal Samplers: import, noise - - would require CPU side computation of the coverage map/color map + - would require CPU side computation of the coverage map/color map (tiling would be a little more difficult... we'll see how effective it would be...) Modifiers (algorithmic w/ direct below sample): clamp,colorcorrect (blend also classifies as this) 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 21c8f44..9151cfe 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp @@ -232,4 +232,4 @@ bmp_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCall fclose(file); return true; } - + 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 947ae18..2985c53 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp @@ -56,7 +56,7 @@ SYNFIG_TARGET_SET_CVS_ID(bmp,"$Id$"); /* === C L A S S E S & S T R U C T S ======================================= */ namespace synfig { - + struct BITMAPFILEHEADER { unsigned char bfType[2]; 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 ac565a1..13fed5c 100644 --- a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp +++ b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp @@ -152,7 +152,7 @@ dv_trgt::init() #if defined(WIN32_PIPE_TO_PROCESSES) string command; - + if(wide_aspect) command=strprintf("encodedv -w 1 - > \"%s\"\n",filename.c_str()); else @@ -170,19 +170,19 @@ dv_trgt::init() #elif defined(UNIX_PIPE_TO_PROCESSES) int p[2]; - + if (pipe(p)) { synfig::error(_("Unable to open pipe to encodedv")); return false; }; - + pid_t pid = fork(); - + if (pid == -1) { synfig::error(_("Unable to open pipe to encodedv")); return false; } - + if (pid == 0){ // Child process // Close pipeout, not needed @@ -209,7 +209,7 @@ dv_trgt::init() synfig::error(_("Unable to open pipe to encodedv")); return false; } - + if(wide_aspect) execlp("encodedv", "encodedv", "-w", "1", "-", (const char *)NULL); else 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 0ab514f..f837c7b 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp @@ -101,27 +101,27 @@ ffmpeg_mptr::seek_to(int frame) #if defined(WIN32_PIPE_TO_PROCESSES) string command; - + command=strprintf("ffmpeg -ss 00:00:00.%d -i \"%s\" -an -f image2pipe -vcodec ppm -\n",frame,filename.c_str()); - + file=popen(command.c_str(),POPEN_BINARY_READ_TYPE); #elif defined(UNIX_PIPE_TO_PROCESSES) int p[2]; - + if (pipe(p)) { cerr<<"Unable to open pipe to ffmpeg"<get_name().c_str(),filename.c_str()); else command=strprintf("ffmpeg -f image2pipe -vcodec ppm -an -r %f -i pipe: -loop -hq -title \"%s\" -vcodec mpeg1video -y \"%s\"\n",desc.get_frame_rate(),get_canvas()->get_name().c_str(),filename.c_str()); - + file=popen(command.c_str(),POPEN_BINARY_WRITE_TYPE); #elif defined(UNIX_PIPE_TO_PROCESSES) int p[2]; - + if (pipe(p)) { synfig::error(_("Unable to open pipe to ffmpeg")); return false; }; - + pid = fork(); - + if (pid == -1) { synfig::error(_("Unable to open pipe to ffmpeg")); return false; } - + if (pid == 0){ // Child process // Close pipeout, not needed diff --git a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h index 327f2f6..f30bda7 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h +++ b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.h @@ -7,7 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2008 Chris Moore -** +** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as ** published by the Free Software Foundation; either version 2 of diff --git a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp index 1b97582..e84effb 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp @@ -178,7 +178,7 @@ Outline::sync() synfig::warning(string("Outline::sync():")+N_("No vertices in outline " + string("\"") + get_description() + string("\""))); return; } - + try { #if 1 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 ebc3569..2860c1f 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp @@ -112,7 +112,7 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog pclose(file); string command; - + if(filename.find("psd")!=String::npos) command=strprintf("convert \"%s\" -flatten \"png32:%s\"\n",filename.c_str(),temp_file.c_str()); else @@ -126,11 +126,11 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog string output="png32:"+temp_file; pid_t pid = fork(); - + if (pid == -1) { return false; } - + if (pid == 0){ // Child process if(filename.find("psd")!=String::npos) @@ -203,9 +203,9 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog return true; #else - + #error This code contains tempfile and arbitrary shell command execution vulnerabilities - + if(file) pclose(file); 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 0dedcc1..32dd839 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp @@ -181,21 +181,21 @@ imagemagick_trgt::start_frame(synfig::ProgressCallback *cb) #elif defined(UNIX_PIPE_TO_PROCESSES) int p[2]; - + if (pipe(p)) { if(cb) cb->error(N_(msg)); else synfig::error(N_(msg)); return false; }; - + pid = fork(); - + if (pid == -1) { if(cb) cb->error(N_(msg)); else synfig::error(N_(msg)); return false; } - + if (pid == 0){ // Child process // Close pipeout, not needed 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 bf8d599..5ad733a 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp @@ -420,8 +420,8 @@ public: context->width, context->height, context->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL); - sws_scale(img_convert_ctx, pict->data, pict->linesize, - + sws_scale(img_convert_ctx, pict->data, pict->linesize, + 0, context->height, encodable->data, encodable->linesize); diff --git a/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.h b/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.h index f418826..57a0c01 100644 --- a/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.h +++ b/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.h @@ -40,9 +40,9 @@ class magickpp_trgt : public synfig::Target_Scanline { SYNFIG_TARGET_MODULE_EXT - + private: - + int width, height; synfig::String filename; @@ -53,7 +53,7 @@ private: std::vector images; public: - + magickpp_trgt(const char *filename) : filename(filename) { } virtual ~magickpp_trgt(); diff --git a/synfig-core/trunk/src/modules/mod_mng/trgt_mng.cpp b/synfig-core/trunk/src/modules/mod_mng/trgt_mng.cpp index 05b127f..7a97c7c 100644 --- a/synfig-core/trunk/src/modules/mod_mng/trgt_mng.cpp +++ b/synfig-core/trunk/src/modules/mod_mng/trgt_mng.cpp @@ -103,8 +103,8 @@ mng_trgt::mng_trgt(const char *Filename) : filename(Filename) { file=NULL; buffer=NULL; - color_buffer=NULL; - zbuffer=NULL; + color_buffer=NULL; + zbuffer=NULL; zbuffer_len=0; ready=false; } @@ -150,7 +150,7 @@ mng_trgt::set_rend_desc(RendDesc *given_desc) bool mng_trgt::init() { - // synfig::info("%s:%d mng_trgt::init()", __FILE__, __LINE__); + // synfig::info("%s:%d mng_trgt::init()", __FILE__, __LINE__); int frame_rate, num_frames, play_time; int num_layers = 1; @@ -207,7 +207,7 @@ mng_trgt::init() color_buffer=new Color[w]; if (color_buffer == NULL) goto cleanup_on_error; return true; - + cleanup_on_error: ready=false; if (mng != MNG_NULL) @@ -219,7 +219,7 @@ cleanup_on_error: mng_int32 extra2; mng_pchar errortext; mng_getlasterror (mng, &severity, &chunkname, &chunkseq, &extra1,&extra2, &errortext); - synfig::error("mng_trgt: libmng: %s",errortext); + synfig::error("mng_trgt: libmng: %s",errortext); mng_cleanup (&mng); } @@ -239,13 +239,13 @@ cleanup_on_error: color_buffer = NULL; } - return false; + return false; } void mng_trgt::end_frame() { - // synfig::info("%s:%d mng_trgt::end_frame()", __FILE__, __LINE__); + // synfig::info("%s:%d mng_trgt::end_frame()", __FILE__, __LINE__); if (deflate(&zstream,Z_FINISH) != Z_STREAM_END) { @@ -269,7 +269,7 @@ mng_trgt::end_frame() bool mng_trgt::start_frame(synfig::ProgressCallback *callback __attribute__ ((unused))) { - // synfig::info("%s:%d mng_trgt::start_frame()", __FILE__, __LINE__); + // synfig::info("%s:%d mng_trgt::start_frame()", __FILE__, __LINE__); if (mng == MNG_NULL) { @@ -282,7 +282,7 @@ mng_trgt::start_frame(synfig::ProgressCallback *callback __attribute__ ((unused) synfig::error("%s:%d mng_putchunk_ihdr()", __FILE__, __LINE__); return false; } - + zstream.zalloc = Z_NULL; zstream.zfree = Z_NULL; zstream.opaque = Z_NULL; diff --git a/synfig-core/trunk/src/modules/mod_mng/trgt_mng.h b/synfig-core/trunk/src/modules/mod_mng/trgt_mng.h index 3c981a4..a194b35 100644 --- a/synfig-core/trunk/src/modules/mod_mng/trgt_mng.h +++ b/synfig-core/trunk/src/modules/mod_mng/trgt_mng.h @@ -63,9 +63,9 @@ class mng_trgt : public synfig::Target_Scanline { SYNFIG_TARGET_MODULE_EXT - + private: - + FILE *file; int w,h; mng_handle mng; @@ -81,7 +81,7 @@ private: unsigned int zbuffer_len; public: - + mng_trgt(const char *filename); virtual ~mng_trgt(); 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 23aa9aa..ffdc153 100644 --- a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp @@ -388,7 +388,7 @@ png_mptr::png_mptr(const char *file_name) orig_height = height; trimmed_x = min_x; trimmed_y = min_y; - + width=max_x-min_x+1; height=max_y-min_y+1; synfig::Surface tmp_buffer; diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index 56ae540..433eeb0 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -1075,7 +1075,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas) // when loading a version 0.1 canvas, modify constant angle // waypoints to that they are within 180 degrees of the previous // waypoint's value - if (type == ValueBase::TYPE_ANGLE) + if (type == ValueBase::TYPE_ANGLE) { if (canvas->get_version() == "0.1") { diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index a1b0ca3..61a263b 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -313,7 +313,7 @@ synfig::Main::~Main() // synfig::info("Module::subsys_stop()"); // Module::subsys_stop(); // synfig::info("Exiting"); - + #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE) signal(SIGPIPE, SIG_DFL); #endif diff --git a/synfig-core/trunk/src/synfig/matrix.h b/synfig-core/trunk/src/synfig/matrix.h index 014bf5b..9d83dd1 100644 --- a/synfig-core/trunk/src/synfig/matrix.h +++ b/synfig-core/trunk/src/synfig/matrix.h @@ -1,7 +1,7 @@ /* === S Y N F I G ========================================================= */ /*! \file matrix.h ** \brief Matrix definitions for 2D affine transformations -** +** ** $Id$ ** ** \legal @@ -72,23 +72,23 @@ public: private: //! The matrix array - value_type m00, m01, m02; - value_type m10, m11, m12; - value_type m20, m21, m22; + value_type m00, m01, m02; + value_type m10, m11, m12; + value_type m20, m21, m22; // Index convention - // 00 01 02 + // 00 01 02 // 10 11 12 // 20 21 22 // vectors are premultiplied when the matrix transformation is applied // we consider the vectors as [1]x[3] arrays. // [1]x[3] * [3]x[3] = [1]x[3] // vector * matrix = vector - // In affine transformation matrixes the values of + // In affine transformation matrixes the values of // m02=0, m12=0 and m22=1 for non projective transformations. public: //!Deafult constructor makes a identity matrix - Matrix() { + Matrix() { m00=1.0; m01=0.0; m02=0.0; m10=0.0; m11=1.0; m12=0.0; m20=0.0; m21=0.0; m22=1.0; @@ -99,8 +99,8 @@ public: (*this).set_rotate(a); } //!set_identity member. Set an identity matrix - Matrix & - set_identity(){ + Matrix & + set_identity(){ m00=1.0; m01=0.0; m02=0.0; m10=0.0; m11=1.0; m12=0.0; m20=0.0; m21=0.0; m22=1.0; @@ -110,7 +110,7 @@ public: //! @param sx Scale by X axis //! @param sy Scale by Y axis //! @return A matrix reference filled with the sx, sy values - Matrix & + Matrix & set_scale(const value_type &sx, const value_type &sy){ m00=sx; m01=0.0; m02=0.0; m10=0.0; m11=sy; m12=0.0; @@ -120,7 +120,7 @@ public: //!set_rotate member function. Sets a rotate matrix //! @param a Rotation angle counterclock wise //! @return A matrix reference filled with the proper rotation parameters - Matrix & + Matrix & set_rotate(const Angle &a){ value_type c(Angle::cos(a).get()); value_type s(Angle::sin(a).get()); @@ -132,22 +132,22 @@ public: //!traslate member function. Sets a translate matrix //! @param t Vector that defines the translation //! @return A matrix reference filled with the proper translation parameters - Matrix & + Matrix & set_translate(const Vector &t){ m00=1.0; m01=0.0; m02=0.0; m10=0.0; m11=1.0; m12=0.0; m20=t[0]; m21=t[1]; m22=1.0; return (*this); } - + //!get_transformed member function. //! @param v 2D Vector to transform //! @return The Vector result - Vector + Vector get_transformed(const Vector &v){ - return Vector(v[0]*m00+v[1]*m10+m20,v[0]*m01+v[1]*m11+m21); + return Vector(v[0]*m00+v[1]*m10+m20,v[0]*m01+v[1]*m11+m21); } - + //! operator *. Multiplication of one matrix by other //! @param rhs the right hand side of the multiplication operation //! @return the resulting multiplication matrix @@ -156,18 +156,18 @@ public: Matrix ret; ret.m00=m00*rhs.m00 + m01*rhs.m10 + m02*rhs.m20; ret.m01=m00*rhs.m01 + m01*rhs.m11 + m02*rhs.m21; - ret.m02=m00*rhs.m02 + m01*rhs.m12 + m02*rhs.m22; - + ret.m02=m00*rhs.m02 + m01*rhs.m12 + m02*rhs.m22; + ret.m10=m10*rhs.m00 + m11*rhs.m10 + m12*rhs.m20; ret.m11=m10*rhs.m01 + m11*rhs.m11 + m12*rhs.m21; - ret.m12=m10*rhs.m02 + m11*rhs.m12 + m12*rhs.m22; - + ret.m12=m10*rhs.m02 + m11*rhs.m12 + m12*rhs.m22; + ret.m20=m20*rhs.m00 + m21*rhs.m10 + m22*rhs.m20; ret.m21=m20*rhs.m01 + m21*rhs.m11 + m22*rhs.m21; - ret.m22=m20*rhs.m02 + m21*rhs.m12 + m22*rhs.m22; + ret.m22=m20*rhs.m02 + m21*rhs.m12 + m22*rhs.m22; return ret; } - + //! operator *=. Multiplication and assign of one matrix by a number //! @param rhs the number to multiply by //! @return the modifed resulting multiplicated by number matrix @@ -176,11 +176,11 @@ public: m00*=rhs; m01*=rhs; m02*=rhs; - + m10*=rhs; m11*=rhs; m12*=rhs; - + m20*=rhs; m21*=rhs; m22*=rhs; @@ -189,23 +189,23 @@ public: //! operator +=. Sum and assign of two matrixes //! @param rhs the matrix to sum - //! @return modified matrix with the summed matrix + //! @return modified matrix with the summed matrix Matrix operator +=(const Matrix &rhs){ m00+=rhs.m00; m01+=rhs.m01; m02+=rhs.m02; - + m10+=rhs.m10; m11+=rhs.m11; m12+=rhs.m12; - + m20+=rhs.m20; m21+=rhs.m21; m22+=rhs.m22; return *this; } - + //! operator *. Multiplication of one matrix by a number //! @param rhs the number to multiply by //! @return the resulting multiplicated by number matrix @@ -216,12 +216,12 @@ public: //! operator +=. Sum and assign of two matrixes //! @param rhs the matrix to sum - //! @return modified matrix with the summed matrix + //! @return modified matrix with the summed matrix Matrix operator +(const Matrix &rhs){ return Matrix(*this)+=rhs; } - + }; }; // END of namespace synfig diff --git a/synfig-core/trunk/src/synfig/nodebase.h b/synfig-core/trunk/src/synfig/nodebase.h index 8785249..f0bb735 100644 --- a/synfig-core/trunk/src/synfig/nodebase.h +++ b/synfig-core/trunk/src/synfig/nodebase.h @@ -85,7 +85,7 @@ public: PX_DEFINE_FUNC0(signal_changed, sigc::signal) PX_DEFINE_FUNC0(signal_deleted, sigc::signal) - + PX_DEFINE_FUNC_CONST0(get_parents, NodeList) PX_DEFINE_FUNC_CONST0(get_children, NodeList) diff --git a/synfig-core/trunk/src/synfig/value.cpp b/synfig-core/trunk/src/synfig/value.cpp index 04ebe68..e5ef475 100644 --- a/synfig-core/trunk/src/synfig/value.cpp +++ b/synfig-core/trunk/src/synfig/value.cpp @@ -118,7 +118,7 @@ ValueBase::get_string() const case TYPE_COLOR: return strprintf("Color (%s)", get(Color()).get_string().c_str()); case TYPE_SEGMENT: return strprintf("Segment ((%f, %f) to (%f, %f))", get(Segment()).p1[0], get(Segment()).p1[1], get(Segment()).p2[0], get(Segment()).p2[1]); case TYPE_BLINEPOINT: return strprintf("BLinePoint (%s)", get(BLinePoint()).get_vertex()[0], get(BLinePoint()).get_vertex()[1]); - + // All types after this point require construction/destruction case TYPE_LIST: return strprintf("List (%d elements)", get(list_type()).size()); diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.cpp b/synfig-core/trunk/src/synfig/valuenode_bline.cpp index 55b19bb..83eb419 100644 --- a/synfig-core/trunk/src/synfig/valuenode_bline.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_bline.cpp @@ -277,7 +277,7 @@ synfig::find_closest_point(const ValueBase &bline, const Point &pos, Real &radiu Real amount = (best_index + best_time + loop_adjust) / (size + loop_adjust); return amount; } - + return 0.0; } diff --git a/synfig-core/trunk/src/synfig/valuenode_log.cpp b/synfig-core/trunk/src/synfig/valuenode_log.cpp index c0a293c..a79dde5 100644 --- a/synfig-core/trunk/src/synfig/valuenode_log.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_log.cpp @@ -59,7 +59,7 @@ ValueNode_Logarithm::ValueNode_Logarithm(const ValueBase &x): Real epsilon(0.000001); value = exp(value); - + set_link("link", ValueNode_Const::create(Real(value))); set_link("epsilon", ValueNode_Const::create(Real(epsilon))); set_link("infinite", ValueNode_Const::create(Real(infinity))); @@ -180,4 +180,4 @@ ValueNode_Logarithm::check_type(ValueBase::Type type) return type==ValueBase::TYPE_REAL; } - + diff --git a/synfig-core/trunk/src/synfig/valuenode_log.h b/synfig-core/trunk/src/synfig/valuenode_log.h index 5230ef9..dfa5ee3 100644 --- a/synfig-core/trunk/src/synfig/valuenode_log.h +++ b/synfig-core/trunk/src/synfig/valuenode_log.h @@ -82,4 +82,4 @@ public: #endif - + diff --git a/synfig-osx/trunk/launcher/dri-surface.h b/synfig-osx/trunk/launcher/dri-surface.h index 899aa7d..8f11739 100644 --- a/synfig-osx/trunk/launcher/dri-surface.h +++ b/synfig-osx/trunk/launcher/dri-surface.h @@ -81,7 +81,7 @@ extern Bool DRICreateSurface(ScreenPtr pScreen, void (*notify) (void *arg, void *data), void *notify_data); -extern Bool DRIDestroySurface(ScreenPtr pScreen, +extern Bool DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable, void (*notify) (void *arg, void *data), diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp index cec5841..3afcc74 100644 --- a/synfig-studio/trunk/src/gtkmm/about.cpp +++ b/synfig-studio/trunk/src/gtkmm/about.cpp @@ -163,7 +163,7 @@ About::About() artists.push_back("Chris Norman (pixelgeek)"); artists.push_back("Daniel Hornung (rubikcube)"); artists.push_back("Franco Iacomella (Yaco)"); - + set_artists(artists); // TRANSLATORS: change this to your name, separate multiple names with \n @@ -192,13 +192,13 @@ About::About() #ifdef SHOW_EXTRA_INFO string extra_info = get_comments() + "\n"; - + #ifdef DEVEL_VERSION extra_info += strprintf(_("\nDevelopment version:\n%s\n"),DEVEL_VERSION); #endif - + extra_info += "\n"; - + extra_info += strprintf(_("Built on %s" /* at %s */ "\n"), __DATE__ /* , __TIME__ */ ); extra_info += "\n"; diff --git a/synfig-studio/trunk/src/gtkmm/about.h b/synfig-studio/trunk/src/gtkmm/about.h index 3be68be..f00a773 100644 --- a/synfig-studio/trunk/src/gtkmm/about.h +++ b/synfig-studio/trunk/src/gtkmm/about.h @@ -35,7 +35,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -# +# namespace studio { @@ -47,7 +47,7 @@ public: void close(int); void on_link_clicked(Gtk::AboutDialog&, const Glib::ustring &url); }; - + }; // END of namespace studio /* === E N D =============================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index d223442..ee4459b 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -542,7 +542,7 @@ public: value=strprintf("%s",App::predefined_size.c_str()); return true; } - + return synfigapp::Settings::get_value(key,value); } @@ -660,7 +660,7 @@ public: ret.push_back("custom_filename_prefix"); ret.push_back("preferred_x_size"); ret.push_back("preferred_y_size"); - ret.push_back("predefined_size"); + ret.push_back("predefined_size"); return ret; } }; @@ -1368,7 +1368,7 @@ App::~App() delete auto_recover; delete about; - + toolbox->hide(); // studio::App::iteration(false); @@ -2221,7 +2221,7 @@ try_open_url(const std::string &url) try { Glib::spawn_async(".", command_line, Glib::SPAWN_SEARCH_PATH); } // Failed, move on to the next one catch(Glib::SpawnError& exception){ continue; } - return true; // No exception means we succeeded! + return true; // No exception means we succeeded! } } @@ -2361,7 +2361,7 @@ App::open_as(std::string filename,std::string as) if (warnings != "") dialog_warning_blocking(_("Warnings"), strprintf("%s:\n\n%s", _("Warnings"), warnings.c_str())); - + if (as.find(custom_filename_prefix.c_str()) != 0) add_recent_file(as); diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp index 9080d65..9f849b0 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp @@ -85,7 +85,7 @@ Dialog_Setup::Dialog_Setup(): toggle_resize_imported_images(_("Scale New Imported Images to Fit Canvas")), adj_pref_x_size(480,1,10000,1,10,0), adj_pref_y_size(270,1,10000,1,10,0) - + { // Setup the buttons @@ -230,13 +230,13 @@ Dialog_Setup::Dialog_Setup(): // Document - New Document X size Gtk::SpinButton* pref_x_size_spinbutton(manage(new Gtk::SpinButton(adj_pref_x_size,1,0))); attach_label(document_table,_("New Document X size"),1, xpadding, ypadding); - document_table->attach(*pref_x_size_spinbutton, 1, 2, 1, 2,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding); + document_table->attach(*pref_x_size_spinbutton, 1, 2, 1, 2,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding); tooltips_.set_tip(*pref_x_size_spinbutton,_("Width in pixels of the new created document")); - + // Document - New Document Y size Gtk::SpinButton* pref_y_size_spinbutton(manage(new Gtk::SpinButton(adj_pref_y_size,1,0))); attach_label(document_table,_("New Document Y size"),2, xpadding, ypadding); - document_table->attach(*pref_y_size_spinbutton, 1, 2, 2, 3,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding); + document_table->attach(*pref_y_size_spinbutton, 1, 2, 2, 3,Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, xpadding, ypadding); tooltips_.set_tip(*pref_y_size_spinbutton,_("High in pixels of the new created document")); //Document - Template for predefined sizes of canvases. @@ -316,7 +316,7 @@ Dialog_Setup::on_apply_pressed() // Set the preferred new Document Y dimension App::preferred_y_size=int(adj_pref_y_size.get_value()); - + // Set the preferred Predefined size App::predefined_size=size_template_combo->get_active_text(); @@ -367,7 +367,7 @@ void Dialog_Setup::on_size_template_combo_change() { String selection(size_template_combo->get_active_text()); - if(selection==DEFAULT_PREDEFINED_SIZE) + if(selection==DEFAULT_PREDEFINED_SIZE) { return; } @@ -433,10 +433,10 @@ Dialog_Setup::refresh() // Refresh the preferred new Document X dimension adj_pref_x_size.set_value(App::preferred_x_size); - + // Refresh the preferred new Document Y dimension adj_pref_y_size.set_value(App::preferred_y_size); - + // Refresh the preferred Predefined size size_template_combo->set_active_text(App::predefined_size); } diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.h b/synfig-studio/trunk/src/gtkmm/dialog_setup.h index 483d211..e0d8fcd 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_setup.h +++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.h @@ -185,7 +185,7 @@ class Dialog_Setup : public Gtk::Dialog Gtk::CheckButton toggle_resize_imported_images; Gtk::Entry textbox_browser_command; - + Gtk::ComboBoxText* size_template_combo; Gtk::Entry textbox_custom_filename_prefix; Gtk::Adjustment adj_pref_x_size; diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index aae4b40..a0f7fca 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -363,7 +363,7 @@ public: row_height = atoi(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT")); if (row_height < 3) row_height = 18; - + cellrenderer_time_track->set_fixed_size(-1,row_height); } } diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 984bb8b..6819b7c 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -948,7 +948,7 @@ Instance::process_action(synfig::String name, synfigapp::Action::ParamList param { //// debug actions // synfig::info("%s:%d process_action: '%s'", __FILE__, __LINE__, name.c_str()); - + assert(synfigapp::Action::book().count(name)); synfigapp::Action::BookEntry entry(synfigapp::Action::book().find(name)->second); diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp index f41d2f8..a69f234 100644 --- a/synfig-studio/trunk/src/gtkmm/layertree.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp @@ -144,7 +144,7 @@ LayerTree::LayerTree(): // button_duplicate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_duplicate_pressed)); // button_encapsulate->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_encapsulate_pressed)); // button_delete->signal_clicked().connect(sigc::mem_fun(*this, &studio::LayerTree::on_delete_pressed)); - + button_raise->set_sensitive(false); button_lower->set_sensitive(false); button_duplicate->set_sensitive(false); diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index 36e4933..9c55193 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -1555,7 +1555,7 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // synfig::info(__FILE__":%d: value_prev 0x%08X:%d",__LINE__,value_prev.get_parent_value_node().get(),value_prev.get_index()); // synfig::info(__FILE__":%d: value_desc 0x%08X:%d",__LINE__,value_desc.get_parent_value_node().get(),value_desc.get_index()); // synfig::info(__FILE__":%d: value_next 0x%08X:%d",__LINE__,value_next.get_parent_value_node().get(),value_next.get_index()); - + /* if(value_prev.parent_is_value_node() && value_desc.parent_is_value_node() && value_next.parent_is_value_node()) { @@ -1605,7 +1605,7 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // (*(value_desc.get_parent_value_node()))(get_time()).get_loop() // // value_desc.get_value_node().get_loop(), // ); - // + // // // Fill in missing vertices // // \todo take loops into account: seeing (15, 2, 3, 4) probably means that (0, 1) is missing, not 14 through 3 // if(value_desc.get_index()button.x); } - + float pos(x/width); if(pos<0 || x<=0)pos=0; if(pos>1)pos=1; diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp index cdf5ea7..ba57435 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp @@ -793,7 +793,7 @@ bool Widget_Timeslider::on_scroll_event(GdkEventScroll* event) //for zooming else { adj_timescale->set_lower(start - (orig_t-t)); - adj_timescale->set_upper(start - (orig_t-t) + (end-start)); + adj_timescale->set_upper(start - (orig_t-t) + (end-start)); } } } diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index fc6bb84..9038bb1 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -2545,7 +2545,7 @@ WorkArea::queue_scroll() drawing_area->queue_draw_area( 0, 0, 1, maxy); drawing_area->queue_draw_area(maxx-dx, 0, maxx-dx, maxy); } - else if (dx < 0) + else if (dx < 0) { drawing_area->queue_draw_area( maxx, 0, maxx, maxy); drawing_area->queue_draw_area( -dx, 0, -dx, maxy); @@ -2555,7 +2555,7 @@ WorkArea::queue_scroll() drawing_area->queue_draw_area(0, 0, maxx, 1); drawing_area->queue_draw_area(0, maxy-dy, maxx, maxy-dy); } - else if (dy < 0) + else if (dy < 0) { drawing_area->queue_draw_area(0, maxy, maxx, maxy); drawing_area->queue_draw_area(0, -dy, maxx, -dy); @@ -2650,7 +2650,7 @@ studio::WorkArea::queue_render_preview() //synfig::info("queue_render_preview(): (re)queuing..."); //render_idle_func_id=g_idle_add_full(G_PRIORITY_DEFAULT,__render_preview,this,NULL); render_idle_func_id=g_timeout_add_full( - G_PRIORITY_DEFAULT, // priority - + G_PRIORITY_DEFAULT, // priority - queue_time, // interval - the time between calls to the function, in milliseconds (1/1000ths of a second) __render_preview, // function - function to call this, // data - data to pass to function diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp index 3b5ab91..7aef925 100644 --- a/synfig-studio/trunk/src/synfigapp/action_system.cpp +++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp @@ -70,7 +70,7 @@ Action::System::perform_action(etl::handle action) { //// debug actions // synfig::info("%s:%d perform_action: '%s'", __FILE__, __LINE__, action->get_name().c_str()); - + handle uim(get_ui_interface()); assert(action); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp index b0fdc62..65252cf 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp @@ -117,7 +117,7 @@ Action::ValueDescExport::is_candidate(const ParamList &x) // synfig::info("%s:%d no export because exported value node", __FILE__, __LINE__); // else if (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline()) // synfig::info("%s:%d no export because canvas isn't inline", __FILE__, __LINE__); - + return false; } return true; diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp index 85ddb64..42cb57a 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp @@ -93,7 +93,7 @@ inline void ThreePointdt(T &df, const T &f1, const T &f2, const T &f3, int bias) // // so only one algorithm needed for left, middle, or right // df = (f1 -f2*2 + f3)*(1/2.0f); // } -// +// // // WARNING -- totally broken // template < class T > // inline void FivePointddt(T &df, const T &f1, const T &f2, const T &f3, int bias) @@ -114,7 +114,7 @@ inline void ThreePointdt(T &df, const T &f1, const T &f2, const T &f3, int bias) // }*/ // //side ones don't work, use 3 point // } -// +// // //implement an arbitrary derivative // //dumb algorithm // template < class T > @@ -122,22 +122,22 @@ inline void ThreePointdt(T &df, const T &f1, const T &f2, const T &f3, int bias) // { // /* // Lj(x) = PI_i!=j (x - xi) / PI_i!=j (xj - xi) -// +// // so Lj'(x) = SUM_k PI_i!=j|k (x - xi) / PI_i!=j (xj - xi) // */ -// +// // unsigned int i,j,k,i0,i1; -// +// // Real Lpj,mult,div,tj; // Real tval = t[indexval]; -// +// // //sum k // for(j=0;j &blinepoint // Wondering whether the modification of the deriv vector // using a char* pointer and pointer arithmetric was safe, // I looked it up... - // + // // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2369.pdf tells me: - // + // // 23.2.5 Class template vector [vector] - // + // // [...] The elements of a vector are stored contiguously, // meaning that if v is a vector where T is // some type other than bool, then it obeys the identity // &v[n] == &v[0] + n for all 0 <= n < v.size(). - // + // GetFirstDerivatives(ftemp,0,size,(char*)&deriv[0],sizeof(deriv[0])); //GetSimpleDerivatives(ftemp,0,size,deriv,0,cum_dist); -- 2.7.4