Commit 016a3f26 authored by Ananta Palani's avatar Ananta Palani
Browse files

Fix compilation on Windows

parent b87a1d0b
......@@ -97,7 +97,6 @@ IF(JPEG_FOUND)
TRY_COMPILE(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file}
CMAKE_FLAGS "${_jpeglib_version_include_dirs}"
COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var
)
IF(_jpeglib_version_compile_result)
MESSAGE(STATUS "Identified libjpeg version less than 80 (too low)")
......@@ -109,7 +108,6 @@ MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "JPEG image format support" "http://www.i
# Flag to use libjpeg with LibRaw DNG lossy codec
IF(JPEG_FOUND)
ADD_DEFINITIONS(-DUSE_JPEG)
ADD_DEFINITIONS(-DUSE_JPEG8)
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
ENDIF()
......
......@@ -5829,8 +5829,8 @@ void CLASS parse_ciff (int offset, int length)
thumb_length = len;
}
if (type == 0x1818) {
shutter = pow (2, -int_to_float((get4(),get4())));
aperture = pow (2, int_to_float(get4())/2);
shutter = pow (2, (double)(-int_to_float((get4(),get4()))));
aperture = pow (2, (double)(int_to_float(get4())/2));
}
if (type == 0x102a) {
iso_speed = pow (2, (get4(),get2())/32.0 - 4) * 50;
......
#ifdef WIN32
#include <math.h>
#ifdef __MINGW32__
#define _WIN32_WINNT 0x0500
#include <stdexcept>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment