mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Use std where needed

merge-requests/239/head
Povilas Kanapickas 2019-11-02 17:13:17 +02:00
rodzic 429d8e4d5b
commit 6fe1db1c73
7 zmienionych plików z 58 dodań i 63 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
backend/genesys/gl124.cpp
Wyświetl plik

@ -385,11 +385,10 @@ static void gl124_send_slope_table(Genesys_Device* dev, int table_nr,
if (DBG_LEVEL >= DBG_io) if (DBG_LEVEL >= DBG_io)
{ {
sprintf (msg, "write slope %d (%d)=", table_nr, steps); std::sprintf(msg, "write slope %d (%d)=", table_nr, steps);
for (i = 0; i < steps; i++) for (i = 0; i < steps; i++) {
{ std::sprintf(msg + std::strlen(msg), ",%d", slope_table[i]);
sprintf (msg+strlen(msg), ",%d", slope_table[i]); }
}
DBG (DBG_io, "%s: %s\n", __func__, msg); DBG (DBG_io, "%s: %s\n", __func__, msg);
} }
@ -1907,7 +1906,7 @@ SensorExposure CommandSetGl124::led_calibration(Genesys_Device* dev, const Genes
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl124_led_%02d.pnm", turn); std::snprintf(fn, 30, "gl124_led_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, line.data(), session.params.depth, channels, num_pixels, sanei_genesys_write_pnm_file(fn, line.data(), session.params.depth, channels, num_pixels,
1); 1);
} }
@ -2068,7 +2067,7 @@ void CommandSetGl124::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char title[30]; char title[30];
snprintf(title, 30, "gl124_offset%03d.pnm", bottom); std::snprintf(title, 30, "gl124_offset%03d.pnm", bottom);
sanei_genesys_write_pnm_file(title, first_line.data(), session.params.depth, sanei_genesys_write_pnm_file(title, first_line.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }
@ -2110,7 +2109,7 @@ void CommandSetGl124::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char title[30]; char title[30];
snprintf(title, 30, "gl124_offset%03d.pnm", dev->frontend.get_offset(1)); std::snprintf(title, 30, "gl124_offset%03d.pnm", dev->frontend.get_offset(1));
sanei_genesys_write_pnm_file(title, second_line.data(), session.params.depth, sanei_genesys_write_pnm_file(title, second_line.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }

28
backend/genesys/gl646.cpp
Wyświetl plik

@ -112,15 +112,15 @@ print_status (uint8_t val)
{ {
char msg[80]; char msg[80];
sprintf (msg, "%s%s%s%s%s%s%s%s", std::sprintf(msg, "%s%s%s%s%s%s%s%s",
val & REG_0x41_PWRBIT ? "PWRBIT " : "", val & REG_0x41_PWRBIT ? "PWRBIT " : "",
val & REG_0x41_BUFEMPTY ? "BUFEMPTY " : "", val & REG_0x41_BUFEMPTY ? "BUFEMPTY " : "",
val & REG_0x41_FEEDFSH ? "FEEDFSH " : "", val & REG_0x41_FEEDFSH ? "FEEDFSH " : "",
val & REG_0x41_SCANFSH ? "SCANFSH " : "", val & REG_0x41_SCANFSH ? "SCANFSH " : "",
val & REG_0x41_HOMESNR ? "HOMESNR " : "", val & REG_0x41_HOMESNR ? "HOMESNR " : "",
val & REG_0x41_LAMPSTS ? "LAMPSTS " : "", val & REG_0x41_LAMPSTS ? "LAMPSTS " : "",
val & REG_0x41_FEBUSY ? "FEBUSY " : "", val & REG_0x41_FEBUSY ? "FEBUSY " : "",
val & REG_0x41_MOTMFLG ? "MOTMFLG" : ""); val & REG_0x41_MOTMFLG ? "MOTMFLG" : "");
DBG(DBG_info, "status=%s\n", msg); DBG(DBG_info, "status=%s\n", msg);
} }
@ -2074,7 +2074,7 @@ SensorExposure CommandSetGl646::led_calibration(Genesys_Device* dev, const Genes
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl646_led_%02d.pnm", turn); std::snprintf(fn, 30, "gl646_led_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, line.data(), 16, channels, settings.pixels, 1); sanei_genesys_write_pnm_file(fn, line.data(), 16, channels, settings.pixels, 1);
} }
@ -2337,7 +2337,7 @@ void CommandSetGl646::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char title[30]; char title[30];
snprintf(title, 30, "gl646_offset%03d.pnm", bottom); std::snprintf(title, 30, "gl646_offset%03d.pnm", bottom);
sanei_genesys_write_pnm_file(title, first_line.data(), 8, channels, sanei_genesys_write_pnm_file(title, first_line.data(), 8, channels,
settings.pixels, settings.lines); settings.pixels, settings.lines);
} }
@ -2355,7 +2355,7 @@ void CommandSetGl646::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char title[30]; char title[30];
snprintf(title, 30, "gl646_offset%03d.pnm", top); std::snprintf(title, 30, "gl646_offset%03d.pnm", top);
sanei_genesys_write_pnm_file (title, second_line.data(), 8, channels, sanei_genesys_write_pnm_file (title, second_line.data(), 8, channels,
settings.pixels, settings.lines); settings.pixels, settings.lines);
} }
@ -2379,7 +2379,7 @@ void CommandSetGl646::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char title[30]; char title[30];
snprintf(title, 30, "gl646_offset%03d.pnm", dev->frontend.get_offset(1)); std::snprintf(title, 30, "gl646_offset%03d.pnm", dev->frontend.get_offset(1));
sanei_genesys_write_pnm_file (title, second_line.data(), 8, channels, sanei_genesys_write_pnm_file (title, second_line.data(), 8, channels,
settings.pixels, settings.lines); settings.pixels, settings.lines);
} }
@ -2467,7 +2467,7 @@ static void ad_fe_coarse_gain_calibration(Genesys_Device* dev, const Genesys_Sen
/* log scanning data */ /* log scanning data */
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
sprintf (title, "gl646_alternative_gain%02d.pnm", pass); std::sprintf(title, "gl646_alternative_gain%02d.pnm", pass);
sanei_genesys_write_pnm_file(title, line.data(), 8, channels, settings.pixels, sanei_genesys_write_pnm_file(title, line.data(), 8, channels, settings.pixels,
settings.lines); settings.lines);
} }

23
backend/genesys/gl841.cpp
Wyświetl plik

@ -564,10 +564,9 @@ static void gl841_send_slope_table(Genesys_Device* dev, int table_nr,
if (DBG_LEVEL >= DBG_io) if (DBG_LEVEL >= DBG_io)
{ {
sprintf (msg, "write slope %d (%d)=", table_nr, steps); std::sprintf(msg, "write slope %d (%d)=", table_nr, steps);
for (i = 0; i < steps; i++) for (i = 0; i < steps; i++) {
{ std::sprintf (msg+strlen(msg), ",%d", slope_table[i]);
sprintf (msg+strlen(msg), ",%d", slope_table[i]);
} }
DBG(DBG_io, "%s: %s\n", __func__, msg); DBG(DBG_io, "%s: %s\n", __func__, msg);
} }
@ -2737,7 +2736,7 @@ SensorExposure CommandSetGl841::led_calibration(Genesys_Device* dev, const Genes
if (DBG_LEVEL >= DBG_data) { if (DBG_LEVEL >= DBG_data) {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl841_led_%d.pnm", turn); std::snprintf(fn, 30, "gl841_led_%d.pnm", turn);
sanei_genesys_write_pnm_file(fn, line.data(), 16, channels, num_pixels, 1); sanei_genesys_write_pnm_file(fn, line.data(), 16, channels, num_pixels, 1);
} }
@ -2920,7 +2919,7 @@ static void ad_fe_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
gl841_stop_action (dev); gl841_stop_action (dev);
if (DBG_LEVEL >= DBG_data) { if (DBG_LEVEL >= DBG_data) {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl841_offset_%02d.pnm", turn); std::snprintf(fn, 30, "gl841_offset_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, line.data(), 8, 3, num_pixels, 1); sanei_genesys_write_pnm_file(fn, line.data(), 8, 3, num_pixels, 1);
} }
@ -3069,7 +3068,7 @@ void CommandSetGl841::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) { if (DBG_LEVEL >= DBG_data) {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl841_offset1_%02d.pnm", turn); std::snprintf(fn, 30, "gl841_offset1_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, first_line.data(), 16, channels, num_pixels, 1); sanei_genesys_write_pnm_file(fn, first_line.data(), 16, channels, num_pixels, 1);
} }
@ -3176,7 +3175,7 @@ void CommandSetGl841::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) { if (DBG_LEVEL >= DBG_data) {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl841_offset2_%02d.pnm", turn); std::snprintf(fn, 30, "gl841_offset2_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, second_line.data(), 16, channels, num_pixels, 1); sanei_genesys_write_pnm_file(fn, second_line.data(), 16, channels, num_pixels, 1);
} }
@ -3792,8 +3791,8 @@ void CommandSetGl841::search_strip(Genesys_Device* dev, const Genesys_Sensor& se
pass = 0; pass = 0;
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
sprintf(title, "gl841_search_strip_%s_%s%02u.pnm", black ? "black" : "white", std::sprintf(title, "gl841_search_strip_%s_%s%02u.pnm", black ? "black" : "white",
forward ? "fwd" : "bwd", pass); forward ? "fwd" : "bwd", pass);
sanei_genesys_write_pnm_file(title, data.data(), session.params.depth, sanei_genesys_write_pnm_file(title, data.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }
@ -3817,8 +3816,8 @@ void CommandSetGl841::search_strip(Genesys_Device* dev, const Genesys_Sensor& se
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
sprintf(title, "gl841_search_strip_%s_%s%02u.pnm", std::sprintf(title, "gl841_search_strip_%s_%s%02u.pnm",
black ? "black" : "white", forward ? "fwd" : "bwd", pass); black ? "black" : "white", forward ? "fwd" : "bwd", pass);
sanei_genesys_write_pnm_file(title, data.data(), session.params.depth, sanei_genesys_write_pnm_file(title, data.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }

27
backend/genesys/gl843.cpp
Wyświetl plik

@ -737,10 +737,9 @@ static void gl843_send_slope_table(Genesys_Device* dev, int table_nr,
if (DBG_LEVEL >= DBG_io) if (DBG_LEVEL >= DBG_io)
{ {
sprintf (msg, "write slope %d (%d)=", table_nr, steps); std::sprintf(msg, "write slope %d (%d)=", table_nr, steps);
for (i = 0; i < steps; i++) for (i = 0; i < steps; i++) {
{ std::sprintf (msg+strlen(msg), "%d", slope_table[i]);
sprintf (msg+strlen(msg), "%d", slope_table[i]);
} }
DBG(DBG_io, "%s: %s\n", __func__, msg); DBG(DBG_io, "%s: %s\n", __func__, msg);
} }
@ -2425,7 +2424,7 @@ SensorExposure CommandSetGl843::led_calibration(Genesys_Device* dev, const Genes
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl843_led_%02d.pnm", turn); std::snprintf(fn, 30, "gl843_led_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, image); sanei_genesys_write_pnm_file(fn, image);
} }
@ -2630,8 +2629,8 @@ void CommandSetGl843::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[40]; char fn[40];
snprintf(fn, 40, "gl843_bottom_offset_%03d_%03d_%03d.pnm", std::snprintf(fn, 40, "gl843_bottom_offset_%03d_%03d_%03d.pnm",
bottom[0], bottom[1], bottom[2]); bottom[0], bottom[1], bottom[2]);
sanei_genesys_write_pnm_file(fn, first_line); sanei_genesys_write_pnm_file(fn, first_line);
} }
@ -2693,11 +2692,11 @@ void CommandSetGl843::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char title[100]; char title[100];
snprintf(title, 100, "lines: %d pixels_per_line: %d offsets[0..2]: %d %d %d\n", std::snprintf(title, 100, "lines: %d pixels_per_line: %d offsets[0..2]: %d %d %d\n",
lines, pixels, lines, pixels,
dev->frontend.get_offset(0), dev->frontend.get_offset(0),
dev->frontend.get_offset(1), dev->frontend.get_offset(1),
dev->frontend.get_offset(2)); dev->frontend.get_offset(2));
debug_image_info += title; debug_image_info += title;
std::copy(second_line.get_row_ptr(0), std::copy(second_line.get_row_ptr(0),
second_line.get_row_ptr(0) + second_line.get_row_bytes() * second_line.get_height(), second_line.get_row_ptr(0) + second_line.get_row_bytes() * second_line.get_height(),
@ -3196,8 +3195,8 @@ void CommandSetGl843::search_strip(Genesys_Device* dev, const Genesys_Sensor& se
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[40]; char fn[40];
snprintf(fn, 40, "gl843_search_strip_%s_%s%02d.pnm", std::snprintf(fn, 40, "gl843_search_strip_%s_%s%02d.pnm",
black ? "black" : "white", forward ? "fwd" : "bwd", pass); black ? "black" : "white", forward ? "fwd" : "bwd", pass);
sanei_genesys_write_pnm_file(fn, data); sanei_genesys_write_pnm_file(fn, data);
} }

10
backend/genesys/gl846.cpp
Wyświetl plik

@ -286,10 +286,10 @@ static void gl846_send_slope_table(Genesys_Device* dev, int table_nr,
if (DBG_LEVEL >= DBG_io) if (DBG_LEVEL >= DBG_io)
{ {
sprintf (msg, "write slope %d (%d)=", table_nr, steps); std::sprintf(msg, "write slope %d (%d)=", table_nr, steps);
for (i = 0; i < steps; i++) for (i = 0; i < steps; i++)
{ {
sprintf (msg+strlen(msg), "%d", slope_table[i]); std::sprintf(msg+strlen(msg), "%d", slope_table[i]);
} }
DBG (DBG_io, "%s: %s\n", __func__, msg); DBG (DBG_io, "%s: %s\n", __func__, msg);
} }
@ -1577,7 +1577,7 @@ SensorExposure CommandSetGl846::led_calibration(Genesys_Device* dev, const Genes
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl846_led_%02d.pnm", turn); std::snprintf(fn, 30, "gl846_led_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, line.data(), session.params.depth, sanei_genesys_write_pnm_file(fn, line.data(), session.params.depth,
channels, num_pixels, 1); channels, num_pixels, 1);
} }
@ -2108,7 +2108,7 @@ void CommandSetGl846::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl846_offset%03d.pnm", bottom); std::snprintf(fn, 30, "gl846_offset%03d.pnm", bottom);
sanei_genesys_write_pnm_file(fn, first_line.data(), session.params.depth, sanei_genesys_write_pnm_file(fn, first_line.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }
@ -2150,7 +2150,7 @@ void CommandSetGl846::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl846_offset%03d.pnm", dev->frontend.get_offset(1)); std::snprintf(fn, 30, "gl846_offset%03d.pnm", dev->frontend.get_offset(1));
sanei_genesys_write_pnm_file(fn, second_line.data(), session.params.depth, sanei_genesys_write_pnm_file(fn, second_line.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }

10
backend/genesys/gl847.cpp
Wyświetl plik

@ -308,10 +308,10 @@ static void gl847_send_slope_table(Genesys_Device* dev, int table_nr,
if (DBG_LEVEL >= DBG_io) if (DBG_LEVEL >= DBG_io)
{ {
sprintf (msg, "write slope %d (%d)=", table_nr, steps); std::sprintf(msg, "write slope %d (%d)=", table_nr, steps);
for (i = 0; i < steps; i++) for (i = 0; i < steps; i++)
{ {
sprintf (msg+strlen(msg), "%d", slope_table[i]); std::sprintf(msg + std::strlen(msg), "%d", slope_table[i]);
} }
DBG (DBG_io, "%s: %s\n", __func__, msg); DBG (DBG_io, "%s: %s\n", __func__, msg);
} }
@ -1610,7 +1610,7 @@ SensorExposure CommandSetGl847::led_calibration(Genesys_Device* dev, const Genes
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl847_led_%02d.pnm", turn); std::snprintf(fn, 30, "gl847_led_%02d.pnm", turn);
sanei_genesys_write_pnm_file(fn, line.data(), session.params.depth, sanei_genesys_write_pnm_file(fn, line.data(), session.params.depth,
channels, num_pixels, 1); channels, num_pixels, 1);
} }
@ -2174,7 +2174,7 @@ void CommandSetGl847::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl847_offset%03d.pnm", bottom); std::snprintf(fn, 30, "gl847_offset%03d.pnm", bottom);
sanei_genesys_write_pnm_file(fn, first_line.data(), session.params.depth, sanei_genesys_write_pnm_file(fn, first_line.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }
@ -2216,7 +2216,7 @@ void CommandSetGl847::offset_calibration(Genesys_Device* dev, const Genesys_Sens
if (DBG_LEVEL >= DBG_data) if (DBG_LEVEL >= DBG_data)
{ {
char fn[30]; char fn[30];
snprintf(fn, 30, "gl847_offset%03d.pnm", dev->frontend.get_offset(1)); std::snprintf(fn, 30, "gl847_offset%03d.pnm", dev->frontend.get_offset(1));
sanei_genesys_write_pnm_file(fn, second_line.data(), session.params.depth, sanei_genesys_write_pnm_file(fn, second_line.data(), session.params.depth,
channels, pixels, lines); channels, pixels, lines);
} }

8
backend/genesys/low.cpp
Wyświetl plik

@ -91,14 +91,12 @@ void sanei_genesys_init_cmd_set(Genesys_Device* dev)
void sanei_genesys_write_file(const char* filename, const std::uint8_t* data, std::size_t length) void sanei_genesys_write_file(const char* filename, const std::uint8_t* data, std::size_t length)
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
FILE *out; std::FILE* out = std::fopen(filename, "w");
out = fopen (filename, "w");
if (!out) { if (!out) {
throw SaneException("could not open %s for writing: %s", filename, strerror(errno)); throw SaneException("could not open %s for writing: %s", filename, strerror(errno));
} }
fwrite(data, 1, length, out); std::fwrite(data, 1, length, out);
fclose(out); std::fclose(out);
} }
// Write data to a pnm file (e.g. calibration). For debugging only // Write data to a pnm file (e.g. calibration). For debugging only