Remove jpeg_memory_src hack that worked around old libjpeg versions

Because Debian Squeeze's libjpeg6 didn't have jpeg_mem_src(), we added
jpeg_memory_src() to provide the functionality.
This shouldn't be needed anymore and without it we can drop libjpeg code
from our repo.

Fixes #110
This commit is contained in:
Daniel Gibson 2015-03-22 16:49:26 +01:00
parent 7b7c7a5238
commit 7e39919bd5

View file

@ -86,7 +86,6 @@ include_directories(${JPEG_INCLUDE_DIR})
set(CMAKE_REQUIRED_INCLUDES ${JPEG_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${JPEG_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY}) set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
CHECK_FUNCTION_EXISTS("jpeg_mem_src" HAVE_JPEG_MEM_SRC)
find_package(OGG REQUIRED) find_package(OGG REQUIRED)
include_directories(${OGG_INCLUDE_DIR}) include_directories(${OGG_INCLUDE_DIR})
@ -279,7 +278,6 @@ if(NOT APPLE AND NOT WIN32)
endif() endif()
set(src_renderer set(src_renderer
renderer/jpeg_memory_src.cpp
renderer/Cinematic.cpp renderer/Cinematic.cpp
renderer/GuiModel.cpp renderer/GuiModel.cpp
renderer/Image_files.cpp renderer/Image_files.cpp