Skip to content

Commit b2b6d83

Browse files
nehebneheb
authored
some std::array conversions (#2148)
Signed-off-by: Rosen Penev <[email protected]>
1 parent 573c3c7 commit b2b6d83

22 files changed

+240
-251
lines changed

‎app/actions.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ namespace {
125125
multi-byte characters correctly. Replace code in the form
126126
os << setw(width) << myString
127127
with
128-
os << make_pair( myString, width)
128+
os << pair( myString, width)
129129
*/
130130
std::ostream& operator<<(std::ostream& os, const std::pair<std::string, int>& strAndWidth);
131131

@@ -317,8 +317,7 @@ namespace Action {
317317
if (Params::instance().files_.size() > 1) {
318318
std::cout << std::setw(20) << path_ << " ";
319319
}
320-
std::cout << std::make_pair( label, align_)
321-
<< ": ";
320+
std::cout << std::pair(label, align_) << ": ";
322321
}
323322

324323
int Print::printTag(const Exiv2::ExifData& exifData,

‎include/exiv2/jpgimage.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ namespace Exiv2 {
379379

380380
private:
381381
// Constant data
382-
static const char exiv2Id_[]; // EXV identifier
383-
static const byte blank_[]; // Minimal exiv2 file
382+
static constexpr char exiv2Id_[] = "Exiv2"; // EXV identifier
383+
static constexpr byte blank_[] = {0xff, 0x01, 'E', 'x', 'i', 'v', '2', 0xff, 0xd9}; // Minimal exiv2 file
384384

385385
}; // class ExvImage
386386

‎include/exiv2/value.hpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,7 @@ namespace Exiv2 {
464464
//! Information pertaining to the defined character sets
465465
struct CharsetTable {
466466
//! Constructor
467-
CharsetTable(CharsetId charsetId,
468-
const char* name,
469-
const char* code);
467+
constexpr CharsetTable(CharsetId charsetId, const char* name, const char* code);
470468
CharsetId charsetId_; //!< Charset id
471469
const char* name_; //!< Name of the charset
472470
const char* code_; //!< Code of the charset

‎src/convert.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ namespace {
15131513
bool convertStringCharsetWindows(std::string& str, const char* from, const char* to)
15141514
{
15151515
bool ret = false;
1516-
const ConvFctList* p = find(convFctList, std::make_pair(from, to));
1516+
const ConvFctList* p = find(convFctList, std::pair(from, to));
15171517
std::string tmpstr = str;
15181518
if (p) ret = p->convFct_(tmpstr);
15191519
#ifndef SUPPRESS_WARNINGS

‎src/cr2image.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "tiffcomposite_int.hpp"
1212
#include "tiffimage_int.hpp"
1313

14+
#include <array>
1415
#include <iostream>
1516

1617
// *****************************************************************************
@@ -136,8 +137,8 @@ namespace Exiv2 {
136137
ExifData ed = exifData;
137138

138139
// Delete IFDs which do not occur in TIFF images
139-
static const IfdId filteredIfds[] = {
140-
panaRawId
140+
static constexpr auto filteredIfds = std::array{
141+
panaRawId,
141142
};
142143
for (auto&& filteredIfd : filteredIfds) {
143144
#ifdef EXIV2_DEBUG_MESSAGES

‎src/exif.cpp‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
// + standard includes
2626
#include <algorithm>
27+
#include <array>
2728
#include <cstdio>
2829
#include <iostream>
2930
#include <utility>
@@ -508,7 +509,7 @@ namespace Exiv2 {
508509

509510
// Delete IFD0 tags that are "not recorded" in compressed images
510511
// Reference: Exif 2.2 specs, 4.6.8 Tag Support Levels, section A
511-
static const char* filteredIfd0Tags[] = {
512+
static constexpr auto filteredIfd0Tags = std::array{
512513
"Exif.Image.PhotometricInterpretation",
513514
"Exif.Image.StripOffsets",
514515
"Exif.Image.RowsPerStrip",
@@ -586,35 +587,35 @@ namespace Exiv2 {
586587
// Delete preview tags if the preview is larger than 32kB.
587588
// Todo: Enhance preview classes to be able to write and delete previews and use that instead.
588589
// Table must be sorted by preview, the first tag in each group is the size
589-
static const PreviewTags filteredPvTags[] = {
590-
{ pttLen, "Exif.Minolta.ThumbnailLength" },
591-
{ pttTag, "Exif.Minolta.ThumbnailOffset" },
592-
{ pttLen, "Exif.Minolta.Thumbnail" },
593-
{ pttLen, "Exif.NikonPreview.JPEGInterchangeFormatLength" },
594-
{ pttIfd, "NikonPreview" },
595-
{ pttLen, "Exif.Olympus.ThumbnailLength" },
596-
{ pttTag, "Exif.Olympus.ThumbnailOffset" },
597-
{ pttLen, "Exif.Olympus.ThumbnailImage" },
598-
{ pttLen, "Exif.Olympus.Thumbnail" },
599-
{ pttLen, "Exif.Olympus2.ThumbnailLength" },
600-
{ pttTag, "Exif.Olympus2.ThumbnailOffset" },
601-
{ pttLen, "Exif.Olympus2.ThumbnailImage" },
602-
{ pttLen, "Exif.Olympus2.Thumbnail" },
603-
{ pttLen, "Exif.OlympusCs.PreviewImageLength" },
604-
{ pttTag, "Exif.OlympusCs.PreviewImageStart" },
605-
{ pttTag, "Exif.OlympusCs.PreviewImageValid" },
606-
{ pttLen, "Exif.Pentax.PreviewLength" },
607-
{ pttTag, "Exif.Pentax.PreviewOffset" },
608-
{ pttTag, "Exif.Pentax.PreviewResolution" },
609-
{ pttLen, "Exif.PentaxDng.PreviewLength" },
610-
{ pttTag, "Exif.PentaxDng.PreviewOffset" },
611-
{ pttTag, "Exif.PentaxDng.PreviewResolution" },
612-
{ pttLen, "Exif.SamsungPreview.JPEGInterchangeFormatLength" },
613-
{ pttIfd, "SamsungPreview" },
614-
{ pttLen, "Exif.Thumbnail.StripByteCounts" },
615-
{ pttIfd, "Thumbnail" },
616-
{ pttLen, "Exif.Thumbnail.JPEGInterchangeFormatLength" },
617-
{ pttIfd, "Thumbnail" }
590+
static constexpr auto filteredPvTags = std::array{
591+
PreviewTags{pttLen, "Exif.Minolta.ThumbnailLength"},
592+
PreviewTags{pttTag, "Exif.Minolta.ThumbnailOffset"},
593+
PreviewTags{pttLen, "Exif.Minolta.Thumbnail"},
594+
PreviewTags{pttLen, "Exif.NikonPreview.JPEGInterchangeFormatLength"},
595+
PreviewTags{pttIfd, "NikonPreview"},
596+
PreviewTags{pttLen, "Exif.Olympus.ThumbnailLength"},
597+
PreviewTags{pttTag, "Exif.Olympus.ThumbnailOffset"},
598+
PreviewTags{pttLen, "Exif.Olympus.ThumbnailImage"},
599+
PreviewTags{pttLen, "Exif.Olympus.Thumbnail"},
600+
PreviewTags{pttLen, "Exif.Olympus2.ThumbnailLength"},
601+
PreviewTags{pttTag, "Exif.Olympus2.ThumbnailOffset"},
602+
PreviewTags{pttLen, "Exif.Olympus2.ThumbnailImage"},
603+
PreviewTags{pttLen, "Exif.Olympus2.Thumbnail"},
604+
PreviewTags{pttLen, "Exif.OlympusCs.PreviewImageLength"},
605+
PreviewTags{pttTag, "Exif.OlympusCs.PreviewImageStart"},
606+
PreviewTags{pttTag, "Exif.OlympusCs.PreviewImageValid"},
607+
PreviewTags{pttLen, "Exif.Pentax.PreviewLength"},
608+
PreviewTags{pttTag, "Exif.Pentax.PreviewOffset"},
609+
PreviewTags{pttTag, "Exif.Pentax.PreviewResolution"},
610+
PreviewTags{pttLen, "Exif.PentaxDng.PreviewLength"},
611+
PreviewTags{pttTag, "Exif.PentaxDng.PreviewOffset"},
612+
PreviewTags{pttTag, "Exif.PentaxDng.PreviewResolution"},
613+
PreviewTags{pttLen, "Exif.SamsungPreview.JPEGInterchangeFormatLength"},
614+
PreviewTags{pttIfd, "SamsungPreview"},
615+
PreviewTags{pttLen, "Exif.Thumbnail.StripByteCounts"},
616+
PreviewTags{pttIfd, "Thumbnail"},
617+
PreviewTags{pttLen, "Exif.Thumbnail.JPEGInterchangeFormatLength"},
618+
PreviewTags{pttIfd, "Thumbnail"},
618619
};
619620
bool delTags = false;
620621
for (auto&& filteredPvTag : filteredPvTags) {

‎src/image.cpp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -66,41 +66,41 @@ namespace {
6666
};
6767

6868
/// \todo Use std::unordered_map for implementing the registry. Avoid to use ImageType::none
69-
const Registry registry[] = {
70-
//image type creation fct type check Exif mode IPTC mode XMP mode Comment mode
69+
constexpr Registry registry[] = {
70+
// image type creation fct type check Exif mode IPTC mode XMP mode Comment mode
7171
//--------------- --------------- ---------- ----------- ----------- ----------- ------------
72-
{ ImageType::jpeg, newJpegInstance, isJpegType, amReadWrite, amReadWrite, amReadWrite, amReadWrite },
73-
{ ImageType::exv, newExvInstance, isExvType, amReadWrite, amReadWrite, amReadWrite, amReadWrite },
74-
{ ImageType::cr2, newCr2Instance, isCr2Type, amReadWrite, amReadWrite, amReadWrite, amNone },
75-
{ ImageType::crw, newCrwInstance, isCrwType, amReadWrite, amNone, amNone, amReadWrite },
76-
{ ImageType::mrw, newMrwInstance, isMrwType, amRead, amRead, amRead, amNone },
77-
{ ImageType::tiff, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone },
78-
{ ImageType::webp, newWebPInstance, isWebPType, amReadWrite, amNone, amReadWrite, amNone },
79-
{ ImageType::dng, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone },
80-
{ ImageType::nef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone },
81-
{ ImageType::pef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone },
82-
{ ImageType::arw, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone },
83-
{ ImageType::rw2, newRw2Instance, isRw2Type, amRead, amRead, amRead, amNone },
84-
{ ImageType::sr2, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone },
85-
{ ImageType::srw, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone },
86-
{ ImageType::orf, newOrfInstance, isOrfType, amReadWrite, amReadWrite, amReadWrite, amNone },
72+
{ImageType::jpeg, newJpegInstance, isJpegType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
73+
{ImageType::exv, newExvInstance, isExvType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
74+
{ImageType::cr2, newCr2Instance, isCr2Type, amReadWrite, amReadWrite, amReadWrite, amNone},
75+
{ImageType::crw, newCrwInstance, isCrwType, amReadWrite, amNone, amNone, amReadWrite},
76+
{ImageType::mrw, newMrwInstance, isMrwType, amRead, amRead, amRead, amNone},
77+
{ImageType::tiff, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
78+
{ImageType::webp, newWebPInstance, isWebPType, amReadWrite, amNone, amReadWrite, amNone},
79+
{ImageType::dng, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
80+
{ImageType::nef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
81+
{ImageType::pef, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
82+
{ImageType::arw, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone},
83+
{ImageType::rw2, newRw2Instance, isRw2Type, amRead, amRead, amRead, amNone},
84+
{ImageType::sr2, newTiffInstance, isTiffType, amRead, amRead, amRead, amNone},
85+
{ImageType::srw, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone},
86+
{ImageType::orf, newOrfInstance, isOrfType, amReadWrite, amReadWrite, amReadWrite, amNone},
8787
#ifdef EXV_HAVE_LIBZ
88-
{ ImageType::png, newPngInstance, isPngType, amReadWrite, amReadWrite, amReadWrite, amReadWrite },
88+
{ImageType::png, newPngInstance, isPngType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
8989
#endif // EXV_HAVE_LIBZ
90-
{ ImageType::pgf, newPgfInstance, isPgfType, amReadWrite, amReadWrite, amReadWrite, amReadWrite },
91-
{ ImageType::raf, newRafInstance, isRafType, amRead, amRead, amRead, amNone },
92-
{ ImageType::eps, newEpsInstance, isEpsType, amNone, amNone, amReadWrite, amNone },
93-
{ ImageType::xmp, newXmpInstance, isXmpType, amReadWrite, amReadWrite, amReadWrite, amNone },
94-
{ ImageType::gif, newGifInstance, isGifType, amNone, amNone, amNone, amNone },
95-
{ ImageType::psd, newPsdInstance, isPsdType, amReadWrite, amReadWrite, amReadWrite, amNone },
96-
{ ImageType::tga, newTgaInstance, isTgaType, amNone, amNone, amNone, amNone },
97-
{ ImageType::bmp, newBmpInstance, isBmpType, amNone, amNone, amNone, amNone },
98-
{ ImageType::jp2, newJp2Instance, isJp2Type, amReadWrite, amReadWrite, amReadWrite, amNone },
90+
{ImageType::pgf, newPgfInstance, isPgfType, amReadWrite, amReadWrite, amReadWrite, amReadWrite},
91+
{ImageType::raf, newRafInstance, isRafType, amRead, amRead, amRead, amNone},
92+
{ImageType::eps, newEpsInstance, isEpsType, amNone, amNone, amReadWrite, amNone},
93+
{ImageType::xmp, newXmpInstance, isXmpType, amReadWrite, amReadWrite, amReadWrite, amNone},
94+
{ImageType::gif, newGifInstance, isGifType, amNone, amNone, amNone, amNone},
95+
{ImageType::psd, newPsdInstance, isPsdType, amReadWrite, amReadWrite, amReadWrite, amNone},
96+
{ImageType::tga, newTgaInstance, isTgaType, amNone, amNone, amNone, amNone},
97+
{ImageType::bmp, newBmpInstance, isBmpType, amNone, amNone, amNone, amNone},
98+
{ImageType::jp2, newJp2Instance, isJp2Type, amReadWrite, amReadWrite, amReadWrite, amNone},
9999
#ifdef EXV_ENABLE_BMFF
100-
{ ImageType::bmff, newBmffInstance, isBmffType, amRead, amRead, amRead, amNone },
100+
{ImageType::bmff, newBmffInstance, isBmffType, amRead, amRead, amRead, amNone},
101101
#endif // EXV_ENABLE_BMFF
102102
// End of list marker
103-
{ ImageType::none, nullptr, nullptr, amNone, amNone, amNone, amNone }
103+
{ImageType::none, nullptr, nullptr, amNone, amNone, amNone, amNone},
104104
};
105105

106106
std::string pathOfFileUrl(const std::string& url) {

‎src/jp2image.cpp‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
#include <iostream>
1919

2020
// JPEG-2000 box types
21-
const uint32_t kJp2BoxTypeJp2Header = 0x6a703268; // 'jp2h'
22-
const uint32_t kJp2BoxTypeImageHeader = 0x69686472; // 'ihdr'
23-
const uint32_t kJp2BoxTypeColorHeader = 0x636f6c72; // 'colr'
24-
const uint32_t kJp2BoxTypeUuid = 0x75756964; // 'uuid'
25-
const uint32_t kJp2BoxTypeClose = 0x6a703263; // 'jp2c'
21+
static constexpr uint32_t kJp2BoxTypeJp2Header = 0x6a703268; // 'jp2h'
22+
static constexpr uint32_t kJp2BoxTypeImageHeader = 0x69686472; // 'ihdr'
23+
static constexpr uint32_t kJp2BoxTypeColorHeader = 0x636f6c72; // 'colr'
24+
static constexpr uint32_t kJp2BoxTypeUuid = 0x75756964; // 'uuid'
25+
static constexpr uint32_t kJp2BoxTypeClose = 0x6a703263; // 'jp2c'
2626

2727
// from openjpeg-2.1.2/src/lib/openjp2/jp2.h
2828
/*#define JPIP_JPIP 0x6a706970*/
@@ -53,30 +53,31 @@ const uint32_t kJp2BoxTypeClose = 0x6a703263; // 'jp2c'
5353
//
5454
// See http://www.jpeg.org/public/wg1n2600.doc for information about embedding IPTC-NAA data in JPEG-2000 files
5555
// See http://www.adobe.com/devnet/xmp/pdfs/xmp_specification.pdf for information about embedding XMP data in JPEG-2000 files
56-
const unsigned char kJp2UuidExif[] = "JpgTiffExif->JP2";
57-
const unsigned char kJp2UuidIptc[] = "\x33\xc7\xa4\xd2\xb8\x1d\x47\x23\xa0\xba\xf1\xa3\xe0\x97\xad\x38";
58-
const unsigned char kJp2UuidXmp[] = "\xbe\x7a\xcf\xcb\x97\xa9\x42\xe8\x9c\x71\x99\x94\x91\xe3\xaf\xac";
56+
static constexpr unsigned char kJp2UuidExif[] = "JpgTiffExif->JP2";
57+
static constexpr unsigned char kJp2UuidIptc[] = "\x33\xc7\xa4\xd2\xb8\x1d\x47\x23\xa0\xba\xf1\xa3\xe0\x97\xad\x38";
58+
static constexpr unsigned char kJp2UuidXmp[] = "\xbe\x7a\xcf\xcb\x97\xa9\x42\xe8\x9c\x71\x99\x94\x91\xe3\xaf\xac";
5959

6060
// See section B.1.1 (JPEG 2000 Signature box) of JPEG-2000 specification
61-
const unsigned char Jp2Signature[12] = { 0x00, 0x00, 0x00, 0x0c, 0x6a, 0x50, 0x20, 0x20, 0x0d, 0x0a, 0x87, 0x0a };
62-
63-
const unsigned char Jp2Blank[] = { 0x00,0x00,0x00,0x0c,0x6a,0x50,0x20,0x20,0x0d,0x0a,0x87,0x0a,0x00,0x00,0x00,0x14,
64-
0x66,0x74,0x79,0x70,0x6a,0x70,0x32,0x20,0x00,0x00,0x00,0x00,0x6a,0x70,0x32,0x20,
65-
0x00,0x00,0x00,0x2d,0x6a,0x70,0x32,0x68,0x00,0x00,0x00,0x16,0x69,0x68,0x64,0x72,
66-
0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x07,0x07,0x00,0x00,0x00,0x00,
67-
0x00,0x0f,0x63,0x6f,0x6c,0x72,0x01,0x00,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x00,
68-
0x00,0x6a,0x70,0x32,0x63,0xff,0x4f,0xff,0x51,0x00,0x29,0x00,0x00,0x00,0x00,0x00,
69-
0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
70-
0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x07,
71-
0x01,0x01,0xff,0x64,0x00,0x23,0x00,0x01,0x43,0x72,0x65,0x61,0x74,0x6f,0x72,0x3a,
72-
0x20,0x4a,0x61,0x73,0x50,0x65,0x72,0x20,0x56,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,
73-
0x31,0x2e,0x39,0x30,0x30,0x2e,0x31,0xff,0x52,0x00,0x0c,0x00,0x00,0x00,0x01,0x00,
74-
0x05,0x04,0x04,0x00,0x01,0xff,0x5c,0x00,0x13,0x40,0x40,0x48,0x48,0x50,0x48,0x48,
75-
0x50,0x48,0x48,0x50,0x48,0x48,0x50,0x48,0x48,0x50,0xff,0x90,0x00,0x0a,0x00,0x00,
76-
0x00,0x00,0x00,0x2d,0x00,0x01,0xff,0x5d,0x00,0x14,0x00,0x40,0x40,0x00,0x00,0x00,
77-
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x93,0xcf,0xb4,
78-
0x04,0x00,0x80,0x80,0x80,0x80,0x80,0xff,0xd9
79-
};
61+
static constexpr unsigned char Jp2Signature[] = {
62+
0x00, 0x00, 0x00, 0x0c, 0x6a, 0x50, 0x20, 0x20, 0x0d, 0x0a, 0x87, 0x0a,
63+
};
64+
65+
static constexpr unsigned char Jp2Blank[] = {
66+
0x00, 0x00, 0x00, 0x0c, 0x6a, 0x50, 0x20, 0x20, 0x0d, 0x0a, 0x87, 0x0a, 0x00, 0x00, 0x00, 0x14, 0x66, 0x74,
67+
0x79, 0x70, 0x6a, 0x70, 0x32, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6a, 0x70, 0x32, 0x20, 0x00, 0x00, 0x00, 0x2d,
68+
0x6a, 0x70, 0x32, 0x68, 0x00, 0x00, 0x00, 0x16, 0x69, 0x68, 0x64, 0x72, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
69+
0x00, 0x01, 0x00, 0x01, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x63, 0x6f, 0x6c, 0x72, 0x01, 0x00,
70+
0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x6a, 0x70, 0x32, 0x63, 0xff, 0x4f, 0xff, 0x51, 0x00,
71+
0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
72+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
73+
0x01, 0x07, 0x01, 0x01, 0xff, 0x64, 0x00, 0x23, 0x00, 0x01, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x3a,
74+
0x20, 0x4a, 0x61, 0x73, 0x50, 0x65, 0x72, 0x20, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x2e,
75+
0x39, 0x30, 0x30, 0x2e, 0x31, 0xff, 0x52, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x04, 0x04, 0x00,
76+
0x01, 0xff, 0x5c, 0x00, 0x13, 0x40, 0x40, 0x48, 0x48, 0x50, 0x48, 0x48, 0x50, 0x48, 0x48, 0x50, 0x48, 0x48,
77+
0x50, 0x48, 0x48, 0x50, 0xff, 0x90, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x01, 0xff, 0x5d,
78+
0x00, 0x14, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
79+
0x00, 0x00, 0xff, 0x93, 0xcf, 0xb4, 0x04, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xff, 0xd9,
80+
};
8081

8182
//! @cond IGNORE
8283
struct Jp2BoxHeader

‎src/jpgimage.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,9 +1243,6 @@ namespace Exiv2 {
12431243
return result;
12441244
}
12451245

1246-
const char ExvImage::exiv2Id_[] = "Exiv2";
1247-
const byte ExvImage::blank_[] = { 0xff,0x01,'E','x','i','v','2',0xff,0xd9 };
1248-
12491246
ExvImage::ExvImage(BasicIo::UniquePtr io, bool create)
12501247
: JpegBase(ImageType::exv, std::move(io), create, blank_, sizeof(blank_))
12511248
{

0 commit comments

Comments
 (0)