diff options
Diffstat (limited to 'converter/other/cameratopam')
-rw-r--r-- | converter/other/cameratopam/camera.c | 2 | ||||
-rw-r--r-- | converter/other/cameratopam/cameratopam.c | 2 | ||||
-rw-r--r-- | converter/other/cameratopam/foveon.c | 4 | ||||
-rw-r--r-- | converter/other/cameratopam/foveon.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/converter/other/cameratopam/camera.c b/converter/other/cameratopam/camera.c index ea5eec39..254b6710 100644 --- a/converter/other/cameratopam/camera.c +++ b/converter/other/cameratopam/camera.c @@ -761,7 +761,7 @@ kodak_radc_load_raw() void kodak_jpeg_load_raw() {} #else -static boolean +static bool fill_input_buffer (j_decompress_ptr cinfo) { static char jpeg_buffer[4096]; diff --git a/converter/other/cameratopam/cameratopam.c b/converter/other/cameratopam/cameratopam.c index 54b68a23..71c9c7af 100644 --- a/converter/other/cameratopam/cameratopam.c +++ b/converter/other/cameratopam/cameratopam.c @@ -69,7 +69,7 @@ int fuji_secondary; float cam_mul[4], pre_mul[4], coeff[3][4]; int histogram[3][0x2000]; jmp_buf failure; -bool use_secondary; +int use_secondary; bool verbose; #ifdef USE_LCMS diff --git a/converter/other/cameratopam/foveon.c b/converter/other/cameratopam/foveon.c index 0198940c..78e40baf 100644 --- a/converter/other/cameratopam/foveon.c +++ b/converter/other/cameratopam/foveon.c @@ -141,8 +141,8 @@ parse_foveon(FILE * const ifp) { void -foveon_coeff(bool * const useCoeffP, - float coeff[3][4]) { +foveon_coeff(int * const useCoeffP, + float coeff[3][4]) { static const float foveon[3][3] = { { 1.4032, -0.2231, -0.1016 }, diff --git a/converter/other/cameratopam/foveon.h b/converter/other/cameratopam/foveon.h index 57be2244..f3177e50 100644 --- a/converter/other/cameratopam/foveon.h +++ b/converter/other/cameratopam/foveon.h @@ -10,5 +10,5 @@ void foveon_load_raw(void); void -foveon_coeff(bool * const useCoeffP, - float coeff[3][4]); +foveon_coeff(int * const useCoeffP, + float coeff[3][4]); |