- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;

- obsolete structure SKINSOUNDDESC removed 
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 7 insertions, 7 deletions

diff --git a/plugins/FreeImage/Source/LibPNG/png.c b/plugins/FreeImage/Source/LibPNG/png.c
index 5a490b2d92..0df53a62af 100644
--- a/plugins/FreeImage/Source/LibPNG/png.c
+++ b/plugins/FreeImage/Source/LibPNG/png.c
@@ -1035,13 +1035,13 @@ int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy)
     *

     *    red-scale =

     *          ( (green-x - blue-x) * (white-y - blue-y) -

-    *            (green-y - blue-y) * (white-x - blue-x) ) / white-y

+    *            (green-y - blue-y) * (white-x - blue-x)) / white-y

     * -------------------------------------------------------------------------

     *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)

     *

     *    green-scale =

     *          ( (red-y - blue-y) * (white-x - blue-x) -

-    *            (red-x - blue-x) * (white-y - blue-y) ) / white-y

+    *            (red-x - blue-x) * (white-y - blue-y)) / white-y

     * -------------------------------------------------------------------------

     *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)

     *

diff --git a/plugins/FreeImage/Source/LibPNG/pngconf.h b/plugins/FreeImage/Source/LibPNG/pngconf.h
index 3fea47b860..121d204ccd 100644
--- a/plugins/FreeImage/Source/LibPNG/pngconf.h
+++ b/plugins/FreeImage/Source/LibPNG/pngconf.h
@@ -182,9 +182,9 @@
  * conventions of the various functions.

  */

 #if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\

-      defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ) &&\

+      defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)) &&\

     ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\

-      defined(_M_X64) || defined(_M_IA64) )

+      defined(_M_X64) || defined(_M_IA64))

   /* Windows system (DOS doesn't support DLLs) running on x86/x64.  Includes

    * builds under Cygwin or MinGW.  Also includes Watcom builds but these need

    * special treatment because they are not compatible with GCC or Visual C

diff --git a/plugins/FreeImage/Source/LibPNG/pngpriv.h b/plugins/FreeImage/Source/LibPNG/pngpriv.h
index 5f751de23d..02cc5d8c53 100644
--- a/plugins/FreeImage/Source/LibPNG/pngpriv.h
+++ b/plugins/FreeImage/Source/LibPNG/pngpriv.h
@@ -532,7 +532,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
 #define PNG_ROWBYTES(pixel_bits, width) \

     ((pixel_bits) >= 8 ? \

     ((png_size_t)(width) * (((png_size_t)(pixel_bits)) >> 3)) : \

-    (( ((png_size_t)(width) * ((png_size_t)(pixel_bits))) + 7) >> 3) )

+    (( ((png_size_t)(width) * ((png_size_t)(pixel_bits))) + 7) >> 3))

 

 /* PNG_OUT_OF_RANGE returns true if value is outside the range

  * ideal-delta..ideal+delta.  Each argument is evaluated twice.

@@ -540,7 +540,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
  * integers, "value" a variable. Added to libpng-1.2.6 JB

  */

 #define PNG_OUT_OF_RANGE(value, ideal, delta) \

-   ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )

+   ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta))

 

 /* Conversions between fixed and floating point, only defined if

  * required (to make sure the code doesn't accidentally use float

diff --git a/plugins/FreeImage/Source/LibPNG/pngrtran.c b/plugins/FreeImage/Source/LibPNG/pngrtran.c
index 26083a0dd5..bbee10ce56 100644
--- a/plugins/FreeImage/Source/LibPNG/pngrtran.c
+++ b/plugins/FreeImage/Source/LibPNG/pngrtran.c
@@ -4331,7 +4331,7 @@ png_do_gamma(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                       ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|

                       ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|

                       ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|

-                      ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));

+                      ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6)));

                   sp++;

                }

             }