Use zero bytes when storing blank patches in TIFF

smistad · Dec 13, 2024 · 2718a17 · 2718a17
1 parent 330d716
commit 2718a17
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/source/FAST/Config.cpp b/source/FAST/Config.cpp
@@ -362,24 +362,17 @@ namespace fast {
 				return;
 			std::cout << "Downloading test data (~2GB) to " << destination << std::endl;
 			createDirectories(destination);
-			std::cout << "Progress: " << std::endl;
 			Window::initializeQtApp();
 			QNetworkAccessManager manager;
-			QUrl url("https://folk.ntnu.no/smistad/fast/FAST_Test_Data.zip");
+			QUrl url("https://smistad.folk.ntnu.no/fast/FAST_Test_Data.zip");
 			QNetworkRequest request(url);
-			auto timer = new QElapsedTimer;
-			timer->start();
+			request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
 			auto reply = manager.get(request);
-			int step = 5;
-			int progress = step;
-			QObject::connect(reply, &QNetworkReply::downloadProgress, [&progress, timer, step](quint64 current, quint64 max) {
-				int percent = ((float)current / max) * 100;
-				float speed = ((float)timer->elapsed() / 1000.0f)/percent;
-				uint64_t remaining = speed * (100 - percent);
-				if(percent >= progress) {
-					std::cout << percent << "% - ETA ~" << (int)std::ceil((float)remaining / 60) << " minutes. " << std::endl;;
-					progress += step;
-				}
+			Progress progressBar(1);
+			progressBar.setText("Downloading");
+			QObject::connect(reply, &QNetworkReply::downloadProgress, [&progressBar](quint64 current, quint64 max) {
+                progressBar.setMax(max)	;
+			    progressBar.update(current)	;
 			});
 			auto tempLocation = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/FAST_Test_Data.zip";
 			QFile file(tempLocation);

diff --git a/source/FAST/Data/Access/ImagePyramidAccess.cpp b/source/FAST/Data/Access/ImagePyramidAccess.cpp
@@ -542,7 +542,7 @@ int ImagePyramidAccess::readTileFromTIFF(void *data, int x, int y, int level) {
     const auto channels = m_image->getNrOfChannels();
     TIFFSetDirectory(m_tiffHandle, level);
     const uint32_t tile_id = TIFFComputeTile(m_tiffHandle, x, y, 0, 0);
-    if(TIFFGetStrileByteCount(m_tiffHandle, tile_id) == 1) { // Blank patch
+    if(TIFFGetStrileByteCount(m_tiffHandle, tile_id) == 0) { // Blank patch
         if(channels == 1) {
             std::memset(data, 0, tileWidth*tileHeight*channels);
         } else {
@@ -605,7 +605,7 @@ void ImagePyramidAccess::setBlankPatch(int level, int x, int y) {
     TIFFSetWriteOffset(m_tiffHandle, 0); // Set write offset to 0, so that we dont appen data
     // Writing zero bytes, will produce a warning, thus we write 1 byte
     char data = 0;
-    TIFFWriteRawTile(m_tiffHandle, tile_id, &data, 1);
+    TIFFWriteRawTile(m_tiffHandle, tile_id, &data, 0);
     TIFFCheckpointDirectory(m_tiffHandle);
     m_initializedPatchList.insert(std::to_string(level) + "-" + std::to_string(tile_id));
 

diff --git a/source/FAST/Data/ImagePyramid.cpp b/source/FAST/Data/ImagePyramid.cpp
@@ -52,12 +52,15 @@ ImagePyramid::ImagePyramid(int width, int height, int channels, int patchWidth,
     TIFFSetErrorHandler([](const char* module, const char* fmt, va_list ap) {
         auto str = make_uninitialized_unique<char[]>(512);
         sprintf(str.get(), fmt, ap);
-        Reporter::warning() << "TIFF: " << module << ": " << str.get() << Reporter::end();
+        std::string str2 = str.get();
+        if(strcmp(module, "TIFFAppendToStrip") == 0 && str2.substr(0, 23) == "Write error at scanline") // Suppress error when writing 0 byte patches
+            return;
+        Reporter::warning() << "TIFF error: " << module << ": " << str.get() << Reporter::end();
     });
     TIFFSetWarningHandler([](const char* module, const char* fmt, va_list ap) {
         auto str = make_uninitialized_unique<char[]>(512);
         sprintf(str.get(), fmt, ap);
-        Reporter::warning() << "TIFF: " << module << ": " << str.get() << Reporter::end();
+        Reporter::warning() << "TIFF warning: " << module << ": " << str.get() << Reporter::end();
     });
     m_tiffHandle = TIFFOpen(m_tiffPath.c_str(), "w8"); // 8 == Bigtiff (64 bit)
     auto tiff = m_tiffHandle;

diff --git a/source/FAST/Utility.cpp b/source/FAST/Utility.cpp
@@ -1281,4 +1281,7 @@ void Progress::setText(std::string text) {
     m_text = text;
 }
 
+void Progress::setMax(uint64_t max) {
+    m_max = max;
+}
 } // end namespace fast
diff --git a/source/FAST/Utility.hpp b/source/FAST/Utility.hpp
@@ -333,6 +333,7 @@ class FAST_EXPORT Progress {
         float getPercent() const;
         void setText(std::string text);
         uint64_t getCurrent() const;
+        void setMax(uint64_t max);
     private:
         std::chrono::high_resolution_clock::time_point m_startTime;
         bool m_print = true;