liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two warnings when using gcc < 7

Browse Source
This commit is contained in:
heckflosse
2017-11-12 13:42:25 +01:00
parent efcdb561d2
commit bd9592cb1f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/cJSON.c
View File

@@ -191,7 +191,7 @@ static const char *parse_string(cJSON *item,const char *str)
len=4;if (uc<0x80) len=1;else if (uc<0x800) len=2;else if (uc<0x10000) len=3; ptr2+=len; len=4;if (uc<0x80) len=1;else if (uc<0x800) len=2;else if (uc<0x10000) len=3; ptr2+=len;
#ifdef __GNUC__ // silence warning #if defined( __GNUC__ ) && __GNUC__ >= 7// silence warning
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif #endif
@@ -203,7 +203,7 @@ static const char *parse_string(cJSON *item,const char *str)
case 1: *--ptr2 =(uc | firstByteMark[len]); case 1: *--ptr2 =(uc | firstByteMark[len]);
} }
#ifdef __GNUC__ #if defined( __GNUC__ ) && __GNUC__ >= 7
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
ptr2+=len; ptr2+=len;

4
rtengine/iptransform.cc
View File

@@ -788,7 +788,7 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
bool enableLCPDist = false; bool enableLCPDist = false;
bool enableCA = false; bool enableCA = false;
#ifdef __GNUC__ // silence warning #if defined( __GNUC__ ) && __GNUC__ >= 7// silence warning
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif #endif
@@ -810,7 +810,7 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
break; break;
} }
} }
#ifdef __GNUC__ #if defined( __GNUC__ ) && __GNUC__ >= 7
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif