Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-30 15:53:03 +04:00 · 2020-02-28 18:34:37 +00:00
parent db5f1c3554 5012fc5d23
commit 333a767be4
9 changed files with 1034 additions and 113 deletions
@@ -154,7 +154,8 @@ enum ImageOrientation
 * Usage example for getting the orientation of the image:
 *
 *      @code
- *      ExifReader reader(fileName);
+ *      std::ifstream stream(filename,std::ios_base::in | std::ios_base::binary);
+ *      ExifReader reader(stream);
 *      if( reader.parse() )
 *      {
 *          int orientation = reader.getTag(Orientation).field_u16;