Merge remote-tracking branch 'origin/dev' into filmnegative

rtengine/CMakeLists.txt

@@ -30,15 +30,19 @@ link_directories("${PROJECT_SOURCE_DIR}/rtexif"
 set(CAMCONSTSFILE "camconst.json")
 
 set(RTENGINESOURCEFILES
+    badpixels.cc
+    CA_correct_RT.cc
+    EdgePreservingDecomposition.cc
+    FTblockDN.cc
+    PF_correct_RT.cc
     ahd_demosaic_RT.cc
     amaze_demosaic_RT.cc
-    CA_correct_RT.cc
+    cJSON.c
     calc_distort.cc
     camconst.cc
     cfa_linedn_RT.cc
     ciecam02.cc
     cieimage.cc
-    cJSON.c
     clutstore.cc
     color.cc
     colortemp.cc
@@ -55,18 +59,13 @@ set(RTENGINESOURCEFILES
     dual_demosaic_RT.cc
     dynamicprofile.cc
     eahd_demosaic.cc
-    EdgePreservingDecomposition.cc
     fast_demo.cc
     ffmanager.cc
     filmnegativeproc.cc
     flatcurves.cc
-    FTblockDN.cc
-    gamutwarning.cc
     gauss.cc
     green_equil_RT.cc
-    guidedfilter.cc
     hilite_recon.cc
-    histmatching.cc
     hphd_demosaic_RT.cc
     iccjpeg.cc
     iccstore.cc
@@ -81,15 +80,10 @@ set(RTENGINESOURCEFILES
     improcfun.cc
     impulse_denoise.cc
     init.cc
-    ipdehaze.cc
     iplab2rgb.cc
-    iplabregions.cc
-    iplocalcontrast.cc
     ipresize.cc
     ipretinex.cc
-    ipshadowshighlights.cc
     ipsharpen.cc
-    ipsoftlight.cc
     iptransform.cc
     ipvibrance.cc
     ipwavelet.cc
@@ -97,8 +91,8 @@ set(RTENGINESOURCEFILES
     jpeg_ijg/jpeg_memsrc.cc
     klt/convolve.cc
     klt/error.cc
-    klt/klt_util.cc
     klt/klt.cc
+    klt/klt_util.cc
     klt/pnmio.cc
     klt/pyramid.cc
     klt/selectGoodFeatures.cc
@@ -107,11 +101,8 @@ set(RTENGINESOURCEFILES
     klt/writeFeatures.cc
     labimage.cc
     lcp.cc
-    lj92.c
     loadinitial.cc
     myfile.cc
-    pdaflinesfilter.cc
-    PF_correct_RT.cc
     pipettebuffer.cc
     pixelshift.cc
     previewimage.cc
@@ -123,17 +114,27 @@ set(RTENGINESOURCEFILES
     rcd_demosaic.cc
     refreshmap.cc
     rt_algo.cc
-    rtlensfun.cc
     rtthumbnail.cc
     shmap.cc
     simpleprocess.cc
     slicer.cc
     stdimagesource.cc
-    tmo_fattal02.cc
     utils.cc
-    vng4_demosaic_RT.cc
+    rtlensfun.cc
+    tmo_fattal02.cc
+    iplocalcontrast.cc
+    histmatching.cc
+    pdaflinesfilter.cc
+    gamutwarning.cc
+    ipshadowshighlights.cc
     xtrans_demosaic.cc
-)
+    vng4_demosaic_RT.cc
+    ipsoftlight.cc
+    guidedfilter.cc
+    ipdehaze.cc
+    iplabregions.cc
+    lj92.c
+    )
 
 if(LENSFUN_HAS_LOAD_DIRECTORY)
     set_source_files_properties(rtlensfun.cc PROPERTIES COMPILE_DEFINITIONS RT_LENSFUN_HAS_LOAD_DIRECTORY)