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

Merge pull request #3293 from Floessie/fix-build-warnings

Browse Source 
Fix build warnings
This commit is contained in:
Ingo Weyrich 2016-05-19 22:51:49 +02:00
commit 4cf80e7c73
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/iccstore.cc
View File

@ -263,7 +263,7 @@ cmsHPROFILE ICCStore::makeStdGammaProfile (cmsHPROFILE iprof)
tags[i].sig == 0x6B545243) { // kTRC tags[i].sig == 0x6B545243) { // kTRC
if (gamma_offset == 0) { if (gamma_offset == 0) {
gamma_offset = offset; gamma_offset = offset;
uint32_t pcurve[] = { htonl(0x63757276), htonl(0), htonl(gamma_size == 12 ? 0 : 1) }; uint32_t pcurve[] = { htonl(0x63757276), htonl(0), htonl(gamma_size == 12 ? 0U : 1U) };
memcpy(&nd[offset], pcurve, 12); memcpy(&nd[offset], pcurve, 12);
if (gamma_size == 14) { if (gamma_size == 14) {

4
rtengine/jdatasrc.cc
View File

@ -32,6 +32,8 @@
/* Expanded data source object for stdio input */ /* Expanded data source object for stdio input */
namespace
{
typedef struct { typedef struct {
struct jpeg_source_mgr pub; /* public fields */ struct jpeg_source_mgr pub; /* public fields */
@ -44,6 +46,8 @@ typedef struct {
typedef my_source_mgr * my_src_ptr; typedef my_source_mgr * my_src_ptr;
}
#define INPUT_BUF_SIZE 4096 /* choose an efficiently fread'able size */ #define INPUT_BUF_SIZE 4096 /* choose an efficiently fread'able size */

3
rtengine/jpeg_memsrc.cc
View File

@ -26,6 +26,8 @@
/* Expanded data source object for memory input */ /* Expanded data source object for memory input */
namespace
{
typedef struct { typedef struct {
struct jpeg_source_mgr pub; /* public fields */ struct jpeg_source_mgr pub; /* public fields */
@ -36,6 +38,7 @@ typedef struct {
typedef my_source_mgr * my_src_ptr; typedef my_source_mgr * my_src_ptr;
}
/* /*
* Initialize source --- called by jpeg_read_header * Initialize source --- called by jpeg_read_header