Feature/split cache classes : Adaptation aux changements dans core-cpp

CHANGELOG.md

@@ -9,6 +9,7 @@ Le format est basé sur [Keep a Changelog](https://keepachangelog.com/) et ce pr
 
 ### Changed
 - Refonte du CHANGELOG au format [Keep a Changelog](https://keepachangelog.com/)
+- Changement des imports de Cache aux imports spécifiques des classes suite à la séparation du fichier Cache dans core-cpp. 
 ### Deprecated
 ### Removed
 ### Fixed

src/cache2work.cpp

@@ -56,9 +56,11 @@ namespace keywords = boost::log::keywords;
 #include <curl/curl.h>
 
 #include <rok4/enums/Format.h>
-#include <rok4/utils/Cache.h>
 #include <rok4/image/file/Rok4Image.h>
 #include <rok4/image/file/FileImage.h>
+#include <rok4/utils/CurlPool.h>
+#include <rok4/utils/ProjPool.h>
+#include <rok4/utils/StoragePool.h>
 
 #include "config.h"
 

src/composeNtiff.cpp

@@ -64,8 +64,9 @@ namespace keywords = boost::log::keywords;
 #include <rok4/image/file/FileImage.h>
 #include <rok4/image/CompoundImage.h>
 #include <rok4/enums/Format.h>
-#include <rok4/utils/Cache.h>
 #include "config.h"
+#include <rok4/utils/ProjPool.h>
+
 
 /** \~french Nombre d'images dans le sens de la largeur */
 int images_widthwise = 0;

src/decimateNtiff.cpp

@@ -65,7 +65,7 @@ namespace keywords = boost::log::keywords;
 #include <rok4/image/file/FileImage.h>
 #include <rok4/image/DecimatedImage.h>
 #include <rok4/image/ExtendedCompoundImage.h>
-#include <rok4/utils/Cache.h>
+#include <rok4/utils/ProjPool.h>
 
 #include <rok4/enums/Format.h>
 #include <math.h>

src/manageNodata.cpp

@@ -72,7 +72,7 @@
 using namespace std;
 
 #include <rok4/enums/Format.h>
-#include <rok4/utils/Cache.h>
+#include <rok4/utils/ProjPool.h>
 #include <rok4/image/file/TiffNodataManager.h>
 
 #include <boost/log/core.hpp>

src/merge4tiff.cpp

@@ -62,9 +62,7 @@ namespace keywords = boost::log::keywords;
 
 #include <rok4/image/Image.h>
 #include <rok4/enums/Format.h>
-#include <rok4/utils/Cache.h>
 #include <rok4/image/file/FileImage.h>
-
 #include "config.h"
 
 /* Valeurs de nodata */
@@ -582,8 +580,8 @@ int fill_background_line ( FileImage* background_image, T* image_line, uint8_t*
 template <typename T>
 int merge ( FileImage* background_image, FileImage* input_images[2][2], FileImage* output_image, FileImage* output_mask, T* nodata ) {
 
-    uint8 merge_weights[1024];
-    for ( int i = 0; i <= 1020; i++ ) merge_weights[i] = 255 - ( uint8 ) round ( pow ( double ( 1020 - i ) /1020., local_gamma ) * 255. );
+    uint8_t merge_weights[1024];
+    for ( int i = 0; i <= 1020; i++ ) merge_weights[i] = 255 - ( uint8_t ) round ( pow ( double ( 1020 - i ) /1020., local_gamma ) * 255. );
 
     int samples_count = width * samplesperpixel;
     int left,right;
@@ -615,7 +613,7 @@ int merge ( FileImage* background_image, FileImage* input_images[2][2], FileImag
         if ( input_images[y][1] ) right = 2*width;
         else right = width;
 
-        for ( uint32 h = 0; h < height / 2; h++ ) {
+        for ( uint32_t h = 0; h < height / 2; h++ ) {
 
             int line = y * height / 2 + h;
 

src/mergeNtiff.cpp

@@ -75,7 +75,7 @@ namespace keywords = boost::log::keywords;
 #include <rok4/image/ExtendedCompoundImage.h>
 #include <rok4/image/file/FileImage.h>
 #include <rok4/enums/Format.h>
-#include <rok4/utils/Cache.h>
+#include <rok4/utils/CurlPool.h>
 #include <rok4/enums/Interpolation.h>
 #include <rok4/processors/PixelConverter.h>
 #include <rok4/image/ReprojectedImage.h>

src/overlayNtiff.cpp

@@ -65,7 +65,6 @@ namespace keywords = boost::log::keywords;
 #include <rok4/enums/Format.h>
 #include <math.h>
 #include "config.h"
-#include <rok4/utils/Cache.h>
 
 /** \~french Chemin du fichier de configuration des images */
 char configuration_path[256];

src/pbf2cache.cpp

@@ -57,7 +57,8 @@ namespace keywords = boost::log::keywords;
 
 #include <rok4/storage/Context.h>
 #include <rok4/image/file/FileImage.h>
-#include <rok4/utils/Cache.h>
+#include <rok4/utils/CurlPool.h>
+#include <rok4/utils/StoragePool.h>
 #include <rok4/image/file/Rok4Image.h>
 #include "config.h"
 

src/work2cache.cpp

@@ -61,7 +61,8 @@ namespace keywords = boost::log::keywords;
 
 #include <rok4/storage/Context.h>
 #include <rok4/image/file/FileImage.h>
-#include <rok4/utils/Cache.h>
+#include <rok4/utils/CurlPool.h>
+#include <rok4/utils/StoragePool.h>
 #include <rok4/image/file/Rok4Image.h>
 #include "config.h"