Row-major storage for encode-file/decode-file

league · Jun 14, 2015 · 1b4db19 · 1b4db19
1 parent 62f06fd
commit 1b4db19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/decode-file.cpp b/decode-file.cpp
@@ -48,8 +48,8 @@ int main(int argc, char** argv)
     ofstream out(secretPath.c_str(), ios::binary);
     bufstate bs = { 0, 0 };
 
-    for(unsigned x = 0; x < g.width(); x++) {
-        for(unsigned y = 0; y < g.height(); y++) {
+    for(unsigned y = 0; y < g.height(); y++) {
+        for(unsigned x = 0; x < g.width(); x++) {
             Color c = im.pixelColor(x, y);
             pushTwoBits(out, bs, c.redQuantum());
             pushTwoBits(out, bs, c.greenQuantum());

diff --git a/encode-file.cpp b/encode-file.cpp
@@ -54,14 +54,14 @@ int main(int argc, char** argv)
     ifstream in(secretPath.c_str(), ios::binary);
     bufstate bs = { 0, 0 };
 
-    for(unsigned x = 0; x < g.width(); x++) {
-        for(unsigned y = 0; y < g.height(); y++) {
+    for(unsigned y = 0; y < g.height(); y++) {
+        for(unsigned x = 0; x < g.width(); x++) {
             Color c = im.pixelColor(x, y);
             c.redQuantum(mergeNextTwoBits(in, bs, c.redQuantum()));
             c.greenQuantum(mergeNextTwoBits(in, bs, c.greenQuantum()));
             c.blueQuantum(mergeNextTwoBits(in, bs, c.blueQuantum()));
             im.pixelColor(x, y, c);
-            if(!in) goto done;
+            //if(!in) goto done;
         }
     }