Revision: 36715 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36715 Author: blendix Date: 2011-05-16 13:34:42 +0000 (Mon, 16 May 2011) Log Message: ----------- LCMS code removed, was an experiment but never finished.
Modified Paths: -------------- trunk/blender/CMakeLists.txt trunk/blender/build_files/cmake/macros.cmake trunk/blender/build_files/scons/config/win32-vc-config.py trunk/blender/build_files/scons/config/win64-vc-config.py trunk/blender/build_files/scons/tools/Blender.py trunk/blender/build_files/scons/tools/btools.py trunk/blender/source/blender/blenkernel/BKE_colortools.h trunk/blender/source/blender/blenkernel/CMakeLists.txt trunk/blender/source/blender/blenkernel/SConscript trunk/blender/source/blender/blenkernel/intern/colortools.c trunk/blender/source/blender/editors/space_image/CMakeLists.txt trunk/blender/source/blender/editors/space_image/SConscript trunk/blender/source/blender/editors/space_image/image_draw.c trunk/blender/source/blender/imbuf/CMakeLists.txt trunk/blender/source/blender/imbuf/IMB_imbuf_types.h trunk/blender/source/blender/imbuf/SConscript trunk/blender/source/blender/imbuf/intern/allocimbuf.c trunk/blender/source/blender/makesrna/SConscript trunk/blender/source/blender/makesrna/intern/CMakeLists.txt trunk/blender/source/blender/makesrna/intern/SConscript trunk/blender/source/blender/makesrna/intern/rna_space.c Modified: trunk/blender/CMakeLists.txt =================================================================== --- trunk/blender/CMakeLists.txt 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/CMakeLists.txt 2011-05-16 13:34:42 UTC (rev 36715) @@ -202,9 +202,6 @@ option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF) endif() -# only for developers who want to make this functional -# option(WITH_LCMS "Enable color correction with lcms" OFF) - if(NOT WITH_GAMEENGINE AND WITH_PLAYER) message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE") endif() @@ -379,13 +376,6 @@ find_package(ZLIB REQUIRED) - if(WITH_LCMS) - set(LCMS /usr CACHE FILEPATH "LCMS directory") - set(LCMS_INCLUDE_DIR ${LCMS}/include) - set(LCMS_LIBRARY lcms) - set(LCMS_LIBPATH ${LCMS}/lib) - endif() - if(WITH_CODEC_FFMPEG) set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory") mark_as_advanced(FFMPEG) @@ -640,14 +630,7 @@ set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF) set(PCRE_LIB pcre) endif() - - if(WITH_LCMS) - set(LCMS ${LIBDIR}/lcms) - set(LCMS_INCLUDE_DIR ${LCMS}/include) - set(LCMS_LIBPATH ${LCMS}/lib) - set(LCMS_LIB lcms) - endif() - + if(WITH_CODEC_FFMPEG) set(FFMPEG ${LIBDIR}/ffmpeg) set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc) @@ -910,13 +893,6 @@ set(OPENEXR_LIBPATH ${OPENEXR}/lib) endif() - if(WITH_LCMS) - set(LCMS ${LIBDIR}/lcms) - set(LCMS_INCLUDE_DIR ${LCMS}/include) - set(LCMS_LIBRARY lcms) - set(LCMS_LIBPATH ${LCMS}/lib) - endif() - if(WITH_CODEC_FFMPEG) set(FFMPEG ${LIBDIR}/ffmpeg) set(FFMPEG_INC ${FFMPEG}/include) Modified: trunk/blender/build_files/cmake/macros.cmake =================================================================== --- trunk/blender/build_files/cmake/macros.cmake 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/build_files/cmake/macros.cmake 2011-05-16 13:34:42 UTC (rev 36715) @@ -88,9 +88,6 @@ if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE) link_directories(${OPENJPEG_LIBPATH}) endif() - if(WITH_LCMS) - link_directories(${LCMS_LIBPATH}) - endif() if(WITH_CODEC_QUICKTIME) link_directories(${QUICKTIME_LIBPATH}) endif() @@ -193,9 +190,6 @@ if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE) target_link_libraries(${target} ${OPENJPEG_LIB}) endif() - if(WITH_LCMS) - target_link_libraries(${target} ${LCMS_LIBRARY}) - endif() if(WITH_CODEC_FFMPEG) target_link_libraries(${target} ${FFMPEG_LIB}) endif() @@ -217,12 +211,6 @@ target_link_libraries(${target} ${EXPAT_LIB}) endif() endif() - if(WITH_LCMS) - if(WIN32 AND NOT UNIX) - target_link_libraries(${target} debug ${LCMS_LIB}_d) - target_link_libraries(${target} optimized ${LCMS_LIB}) - endif() - endif() if(WITH_MEM_JEMALLOC) target_link_libraries(${target} ${JEMALLOC_LIBRARY}) endif() Modified: trunk/blender/build_files/scons/config/win32-vc-config.py =================================================================== --- trunk/blender/build_files/scons/config/win32-vc-config.py 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/build_files/scons/config/win32-vc-config.py 2011-05-16 13:34:42 UTC (rev 36715) @@ -149,12 +149,6 @@ BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' -WITH_BF_LCMS = False -BF_LCMS = LIBDIR + '/lcms' -BF_LCMS_INC = '${BF_LCMS}/include' -BF_LCMS_LIB = 'lcms' -BF_LCMS_LIBPATH = '${BF_LCMS}/lib' - #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE'] Modified: trunk/blender/build_files/scons/config/win64-vc-config.py =================================================================== --- trunk/blender/build_files/scons/config/win64-vc-config.py 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/build_files/scons/config/win64-vc-config.py 2011-05-16 13:34:42 UTC (rev 36715) @@ -151,12 +151,6 @@ BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' -WITH_BF_LCMS = False -BF_LCMS = LIBDIR + '/lcms' -BF_LCMS_INC = '${BF_LCMS}/include' -BF_LCMS_LIB = 'lcms' -BF_LCMS_LIBPATH = '${BF_LCMS}/lib' - #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2'] Modified: trunk/blender/build_files/scons/tools/Blender.py =================================================================== --- trunk/blender/build_files/scons/tools/Blender.py 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/build_files/scons/tools/Blender.py 2011-05-16 13:34:42 UTC (rev 36715) @@ -148,8 +148,6 @@ libincs += Split(lenv['BF_OPENEXR_LIBPATH']) if lenv['WITH_BF_STATICOPENEXR']: statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) - if lenv['WITH_BF_LCMS']: - libincs += Split(lenv['BF_LCMS_LIBPATH']) if lenv['WITH_BF_TIFF']: libincs += Split(lenv['BF_TIFF_LIBPATH']) if lenv['WITH_BF_STATICTIFF']: @@ -258,8 +256,6 @@ syslibs += Split(lenv['BF_OPENGL_LIB']) if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc'): syslibs += Split(lenv['BF_PTHREADS_LIB']) - if lenv['WITH_BF_LCMS']: - syslibs.append(lenv['BF_LCMS_LIB']) if lenv['WITH_BF_COLLADA']: syslibs.append(lenv['BF_PCRE_LIB']) syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) Modified: trunk/blender/build_files/scons/tools/btools.py =================================================================== --- trunk/blender/build_files/scons/tools/btools.py 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/build_files/scons/tools/btools.py 2011-05-16 13:34:42 UTC (rev 36715) @@ -125,7 +125,6 @@ 'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG', - 'WITH_BF_LCMS', 'BF_LCMS', 'BF_LCMS_INC', 'BF_LCMS_LIB', 'BF_LCMS_LIBPATH', 'WITH_BF_DOCS', 'BF_NUMJOBS', 'BF_MSVS', @@ -334,12 +333,6 @@ ('BF_TIFF_LIBPATH', 'TIFF library path', ''), ('BF_TIFF_LIB_STATIC', 'TIFF static library', ''), - (BoolVariable('WITH_BF_LCMS', 'Enable color correction with lcms', False)), - ('BF_LCMS', 'LCMS base path', ''), - ('BF_LCMS_INC', 'LCMS include path', ''), - ('BF_LCMS_LIB', 'LCMS library', ''), - ('BF_LCMS_LIBPATH', 'LCMS library path', ''), - (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)), (BoolVariable('WITH_BF_STATICZLIB', 'Staticly link to ZLib', False)), ('BF_ZLIB', 'ZLib base path', ''), Modified: trunk/blender/source/blender/blenkernel/BKE_colortools.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_colortools.h 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/source/blender/blenkernel/BKE_colortools.h 2011-05-16 13:34:42 UTC (rev 36715) @@ -78,7 +78,6 @@ int curvemapping_RGBA_does_something(struct CurveMapping *cumap); void curvemapping_initialize(struct CurveMapping *cumap); void curvemapping_table_RGBA(struct CurveMapping *cumap, float **array, int *size); -void colorcorrection_do_ibuf(struct ImBuf *ibuf, const char *profile); void scopes_update(struct Scopes *scopes, struct ImBuf *ibuf, int use_color_management); void scopes_free(struct Scopes *scopes); Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-16 13:34:42 UTC (rev 36715) @@ -277,11 +277,6 @@ add_definitions(-DWITH_FFMPEG) endif() -if(WITH_LCMS) - list(APPEND INC ${LCMS_INCLUDE_DIR}) - add_definitions(-DWITH_LCMS) -endif() - if(WITH_PYTHON) list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS}) add_definitions(-DWITH_PYTHON) Modified: trunk/blender/source/blender/blenkernel/SConscript =================================================================== --- trunk/blender/source/blender/blenkernel/SConscript 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/source/blender/blenkernel/SConscript 2011-05-16 13:34:42 UTC (rev 36715) @@ -78,10 +78,6 @@ if env['BF_NO_ELBEEM']: defs.append('DISABLE_ELBEEM') -if env['WITH_BF_LCMS']: - defs.append('WITH_LCMS') - incs += ' ' + env['BF_LCMS_INC'] - if env['WITH_BF_LZO']: incs += ' #/extern/lzo/minilzo' defs.append('WITH_LZO') Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/colortools.c 2011-05-16 11:46:16 UTC (rev 36714) +++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2011-05-16 13:34:42 UTC (rev 36715) @@ -37,10 +37,6 @@ #include <stdlib.h> #include <float.h> -#ifdef WITH_LCMS -#include <lcms.h> -#endif - #include "MEM_guardedalloc.h" #include "DNA_color_types.h" @@ -789,60 +785,6 @@ } -#ifdef WITH_LCMS -/* basic error handler, if we dont do this blender will exit */ -static int ErrorReportingFunction(int ErrorCode, const char *ErrorText) -{ - fprintf(stderr, "%s:%d\n", ErrorText, ErrorCode); - return 1; -} -#endif - -void colorcorrection_do_ibuf(ImBuf *ibuf, const char *profile) -{ -#ifdef WITH_LCMS - if (ibuf->crect == NULL) - { - cmsHPROFILE proofingProfile; - - /* TODO, move to initialization area of code */ - //cmsSetLogErrorHandler(ErrorReportingFunction); - cmsSetErrorHandler(ErrorReportingFunction); - - /* will return NULL if the file isn't fount */ - proofingProfile = cmsOpenProfileFromFile(profile, "r"); - - cmsErrorAction(LCMS_ERROR_SHOW); - - if(proofingProfile) { - cmsHPROFILE imageProfile; - cmsHTRANSFORM hTransform; - - ibuf->crect = MEM_mallocN(ibuf->x*ibuf->y*sizeof(int), "imbuf crect"); - - imageProfile = cmsCreate_sRGBProfile(); - - - hTransform = cmsCreateProofingTransform(imageProfile, TYPE_RGBA_8, imageProfile, TYPE_RGBA_8, - proofingProfile, @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs