Skip to content

Commit 34a2e59

Browse files
authored
Merge pull request #47 from rok4/develop
Correction de l'encodage de TiffDeflateEncoder
2 parents 0847c7b + 2adb98c commit 34a2e59

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 2.0.2
2+
3+
### [Fixed]
4+
5+
* `TiffDeflateEncoder` : l'encodage du résultat final n'est pas en deflate (seule la donnée dans le tiff l'est, et non le résultat complet)
6+
* `S3Context` : on retourne bien false lorsqu'une erreur est rencontrée lors du flush (close_to_write)
7+
8+
19
## 2.0.1
210

311
### [Added]

include/rok4/datastream/TiffDeflateEncoder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class TiffDeflateEncoder : public TiffEncoder {
160160
}
161161

162162
std::string get_encoding() {
163-
return "deflate";
163+
return "";
164164
}
165165
};
166166

src/storage/S3Context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ bool S3Context::close_to_write(std::string name) {
656656

657657
BOOST_LOG_TRIVIAL(error) << "Unable to flush " << it1->second->size() << " bytes in the S3 object " << bucket_name << "@" << ((cluster_name != "") ? cluster_name : host) << " / " << name << " after " << write_attempts << " tries" ;
658658

659-
return true;
659+
return false;
660660
}
661661

662662
bool S3Context::exists(std::string name) {

0 commit comments

Comments
 (0)