[gimp] Issue !125: avoid conflict with win32 macro.



commit 5d365352ca7d82c4ce4219b001dbcf47fe7fed23
Author: lillolollo <4179-lillolollo users noreply gitlab gnome org>
Date:   Wed Sep 11 19:01:49 2019 +0000

    Issue !125: avoid conflict with win32 macro.
    
    jpeg-save.c:56: warning: "DEFAULT_QUALITY" redefined
       56 | #define DEFAULT_QUALITY          90.0
          |
    In file included from C:/msys64/mingw64/x86_64-w64-mingw32/include/windows.h:71,
                     from C:/msys64/mingw64/x86_64-w64-mingw32/include/rpc.h:16,
                     from C:/msys64/mingw64/x86_64-w64-mingw32/include/objbase.h:7,
                     from C:/msys64/mingw64/x86_64-w64-mingw32/include/shlwapi.h:16,
                     from C:/msys64/mingw64/include/jmorecfg.h:19,
                     from C:/msys64/mingw64/include/jpeglib.h:31,
                     from jpeg-save.c:33:
    C:/msys64/mingw64/x86_64-w64-mingw32/include/wingdi.h:1140: note: this is the location of the previous 
definition
     1140 | #define DEFAULT_QUALITY 0

 plug-ins/file-jpeg/jpeg-save.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index 807c1283e8..ca1fc5ffcf 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -53,7 +53,7 @@ static gboolean arithc_supported = FALSE;
 #define SCALE_WIDTH         125
 
 /* See bugs #63610 and #61088 for a discussion about the quality settings */
-#define DEFAULT_QUALITY          90.0
+#define DEFAULT_IJG_QUALITY      90.0
 #define DEFAULT_SMOOTHING        0.0
 #define DEFAULT_OPTIMIZE         TRUE
 #define DEFAULT_ARITHMETIC_CODING FALSE
@@ -1299,7 +1299,7 @@ save_dialog_response (GtkWidget *widget,
 void
 load_defaults (void)
 {
-  jsvals.quality          = DEFAULT_QUALITY;
+  jsvals.quality          = DEFAULT_IJG_QUALITY;
   jsvals.smoothing        = DEFAULT_SMOOTHING;
   jsvals.optimize         = DEFAULT_OPTIMIZE;
   jsvals.arithmetic_coding= DEFAULT_ARITHMETIC_CODING;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]