Skip to content

D
dlib
Commit 1653a8f5 authored by Davis King's avatar Davis King
Browse files
Options

changed the array2d overloads to read/write all the data in one block.

parent dc9db580
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 30 deletions
dlib/array2d/serialize_pixel_overloads.h
View file @ 1653a8f5
...@@ -36,9 +36,8 @@ namespace dlib ...@@ -36,9 +36,8 @@ namespace dlib
COMPILE_TIME_ASSERT(sizeof(rgb_pixel) == 3); COMPILE_TIME_ASSERT(sizeof(rgb_pixel) == 3);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) out.write((char*)&item[0][0], sizeof(rgb_pixel)*item.size());
out.write((char*)&item[r][0], sizeof(rgb_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -64,9 +63,8 @@ namespace dlib ...@@ -64,9 +63,8 @@ namespace dlib
item.set_size(nr,nc); item.set_size(nr,nc);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) in.read((char*)&item[0][0], sizeof(rgb_pixel)*item.size());
in.read((char*)&item[r][0], sizeof(rgb_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -92,9 +90,8 @@ namespace dlib ...@@ -92,9 +90,8 @@ namespace dlib
COMPILE_TIME_ASSERT(sizeof(bgr_pixel) == 3); COMPILE_TIME_ASSERT(sizeof(bgr_pixel) == 3);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) out.write((char*)&item[0][0], sizeof(bgr_pixel)*item.size());
out.write((char*)&item[r][0], sizeof(bgr_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -120,9 +117,8 @@ namespace dlib ...@@ -120,9 +117,8 @@ namespace dlib
item.set_size(nr,nc); item.set_size(nr,nc);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) in.read((char*)&item[0][0], sizeof(bgr_pixel)*item.size());
in.read((char*)&item[r][0], sizeof(bgr_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -148,9 +144,8 @@ namespace dlib ...@@ -148,9 +144,8 @@ namespace dlib
COMPILE_TIME_ASSERT(sizeof(hsi_pixel) == 3); COMPILE_TIME_ASSERT(sizeof(hsi_pixel) == 3);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) out.write((char*)&item[0][0], sizeof(hsi_pixel)*item.size());
out.write((char*)&item[r][0], sizeof(hsi_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -176,9 +171,8 @@ namespace dlib ...@@ -176,9 +171,8 @@ namespace dlib
item.set_size(nr,nc); item.set_size(nr,nc);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) in.read((char*)&item[0][0], sizeof(hsi_pixel)*item.size());
in.read((char*)&item[r][0], sizeof(hsi_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -204,9 +198,8 @@ namespace dlib ...@@ -204,9 +198,8 @@ namespace dlib
COMPILE_TIME_ASSERT(sizeof(rgb_alpha_pixel) == 4); COMPILE_TIME_ASSERT(sizeof(rgb_alpha_pixel) == 4);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) out.write((char*)&item[0][0], sizeof(rgb_alpha_pixel)*item.size());
out.write((char*)&item[r][0], sizeof(rgb_alpha_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -232,9 +225,8 @@ namespace dlib ...@@ -232,9 +225,8 @@ namespace dlib
item.set_size(nr,nc); item.set_size(nr,nc);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) in.read((char*)&item[0][0], sizeof(rgb_alpha_pixel)*item.size());
in.read((char*)&item[r][0], sizeof(rgb_alpha_pixel)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -258,9 +250,8 @@ namespace dlib ...@@ -258,9 +250,8 @@ namespace dlib
serialize(item.nc(),out); serialize(item.nc(),out);
serialize(item.nr(),out); serialize(item.nr(),out);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) out.write((char*)&item[0][0], sizeof(unsigned char)*item.size());
out.write((char*)&item[r][0], sizeof(unsigned char)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
...@@ -284,9 +275,8 @@ namespace dlib ...@@ -284,9 +275,8 @@ namespace dlib
item.set_size(nr,nc); item.set_size(nr,nc);
// write each row if (item.size() != 0)
for (long r = 0; r < item.nr(); ++r) in.read((char*)&item[0][0], sizeof(unsigned char)*item.size());
in.read((char*)&item[r][0], sizeof(unsigned char)*item.nc());
} }
catch (serialization_error e) catch (serialization_error e)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment