|
25 | 25 | #include "FreeImage.h" |
26 | 26 | #include "Utilities.h" |
27 | 27 |
|
| 28 | +#include <cstring> |
| 29 | + |
28 | 30 | // ========================================================== |
29 | 31 | // Internal functions |
30 | 32 | // ========================================================== |
31 | 33 |
|
32 | | -#define MAX_LINE 512 |
| 34 | +#define MAX_LINE 512 |
| 35 | +#define LINE_FORMAT_WIDTH_OR_HEIGHT "#define %" FI_QUOTE(MAX_LINE) "s %d" |
| 36 | +#define LINE_FORMAT_BITS_V10 "static short %" FI_QUOTE(MAX_LINE) "s = {" |
| 37 | +#define LINE_FORMAT_BITS_V11_OPT1 "static char %" FI_QUOTE(MAX_LINE) "s = {" |
| 38 | +#define LINE_FORMAT_BITS_V11_OPT2 "static unsigned char %" FI_QUOTE(MAX_LINE) "s = {" |
33 | 39 |
|
34 | 40 | static const char *ERR_XBM_SYNTAX = "Syntax error"; |
35 | 41 | static const char *ERR_XBM_LINE = "Line too long"; |
@@ -87,76 +93,79 @@ Read an XBM file into a buffer |
87 | 93 | */ |
88 | 94 | static const char* |
89 | 95 | readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, std::unique_ptr<void, decltype(&free)> &dataP) { |
90 | | - char line[MAX_LINE], name_and_type[MAX_LINE]; |
91 | | - char *ptr{}; |
92 | | - char *t{}; |
| 96 | + std::string line(MAX_LINE, '\0'), name(MAX_LINE + 1, '\0'); |
| 97 | + char *ptr{}; |
93 | 98 | int version = 0; |
94 | 99 | size_t bytes, bytes_per_line, raster_length; |
95 | | - int v, padding; |
96 | 100 | int c1, c2, value1, value2; |
97 | 101 | int hex_table[256]; |
98 | | - bool found_declaration{}; // haven't found it yet; haven't even looked |
| 102 | + bool found_declaration{}; // haven't found it yet; haven't even looked |
99 | 103 | /* in scanning through the bitmap file, we have found the first |
100 | | - line of the C declaration of the array (the "static char ..." |
101 | | - or whatever line) |
| 104 | + line of the C declaration of the array (the "static char ..." or whatever line) |
102 | 105 | */ |
103 | | - bool eof{}; // we've encountered end of file while searching file |
104 | 106 |
|
105 | 107 | *widthP = *heightP = -1; |
106 | 108 |
|
107 | | - while (!found_declaration && !eof) { |
| 109 | + for (;;) { |
| 110 | + if (!readLine(line.data(), MAX_LINE, io, handle)) { |
| 111 | + break; |
| 112 | + } |
108 | 113 |
|
109 | | - if (!readLine(line, MAX_LINE, io, handle)) { |
110 | | - eof = true; |
| 114 | + if (strlen(line.c_str()) >= MAX_LINE - 1) { |
| 115 | + return ERR_XBM_LINE; |
111 | 116 | } |
112 | | - else { |
113 | | - if (strlen(line) == MAX_LINE - 1) |
114 | | - return( ERR_XBM_LINE ); |
115 | | - if (sscanf_s(line, "#define %s %d", name_and_type, MAX_LINE, &v) == 2) { |
116 | | - if ((t = strrchr(name_and_type, '_')) == nullptr) |
117 | | - t = name_and_type; |
118 | | - else |
119 | | - t++; |
120 | | - if (!strcmp("width", t)) |
121 | | - *widthP = v; |
122 | | - else if (!strcmp("height", t)) |
123 | | - *heightP = v; |
124 | | - continue; |
125 | | - } |
126 | 117 |
|
127 | | - if (sscanf_s(line, "static short %s = {", name_and_type, MAX_LINE) == 1) { |
128 | | - version = 10; |
129 | | - found_declaration = true; |
130 | | - } |
131 | | - else if (sscanf_s(line, "static char %s = {", name_and_type, MAX_LINE) == 1) { |
132 | | - version = 11; |
133 | | - found_declaration = true; |
134 | | - } |
135 | | - else if (sscanf_s(line, "static unsigned char %s = {", name_and_type, MAX_LINE) == 1) { |
136 | | - version = 11; |
137 | | - found_declaration = true; |
| 118 | + int val{}; |
| 119 | + if (2 == std::sscanf(line.c_str(), LINE_FORMAT_WIDTH_OR_HEIGHT, name.data(), &val)) { |
| 120 | + if (const auto suffix = std::strrchr(name.c_str(), '_')) { |
| 121 | + if (0 == std::strcmp("_width", suffix)) { |
| 122 | + *widthP = val; |
| 123 | + continue; |
| 124 | + } |
| 125 | + if (0 == std::strcmp("_height", suffix)) { |
| 126 | + *heightP = val; |
| 127 | + continue; |
| 128 | + } |
138 | 129 | } |
139 | 130 | } |
| 131 | + |
| 132 | + if (1 == std::sscanf(line.c_str(), LINE_FORMAT_BITS_V10, name.data())) { |
| 133 | + version = 10; |
| 134 | + found_declaration = true; |
| 135 | + break; |
| 136 | + } |
| 137 | + |
| 138 | + if (1 == std::sscanf(line.c_str(), LINE_FORMAT_BITS_V11_OPT1, name.data()) || |
| 139 | + 1 == std::sscanf(line.c_str(), LINE_FORMAT_BITS_V11_OPT2, name.data())) { |
| 140 | + version = 11; |
| 141 | + found_declaration = true; |
| 142 | + break; |
| 143 | + } |
140 | 144 | } |
141 | 145 |
|
142 | | - if (!found_declaration) |
143 | | - return( ERR_XBM_DECL ); |
| 146 | + if (!found_declaration) { |
| 147 | + return ERR_XBM_DECL; |
| 148 | + } |
144 | 149 |
|
145 | | - if (*widthP == -1) |
146 | | - return( ERR_XBM_WIDTH ); |
147 | | - if (*heightP == -1) |
148 | | - return( ERR_XBM_HEIGHT ); |
| 150 | + if (*widthP <= 0) { |
| 151 | + return ERR_XBM_WIDTH; |
| 152 | + } |
| 153 | + if (*heightP <= 0) { |
| 154 | + return ERR_XBM_HEIGHT; |
| 155 | + } |
149 | 156 |
|
150 | | - padding = 0; |
151 | | - if ( ((*widthP % 16) >= 1) && ((*widthP % 16) <= 8) && (version == 10) ) |
| 157 | + int padding = 0; |
| 158 | + if (((*widthP % 16) >= 1) && ((*widthP % 16) <= 8) && (version == 10)) { |
152 | 159 | padding = 1; |
| 160 | + } |
153 | 161 |
|
154 | 162 | bytes_per_line = (*widthP + 7) / 8 + padding; |
155 | 163 |
|
156 | 164 | raster_length = bytes_per_line * *heightP; |
157 | 165 | dataP.reset(malloc(raster_length)); |
158 | | - if (!dataP) |
159 | | - return( ERR_XBM_MEMORY ); |
| 166 | + if (!dataP) { |
| 167 | + return ERR_XBM_MEMORY; |
| 168 | + } |
160 | 169 |
|
161 | 170 | // initialize hex_table |
162 | 171 | for ( c1 = 0; c1 < 256; c1++ ) { |
|
0 commit comments