ozfdecoder.cpp compile error (a0f9f337da7d, current tip)

There appears to be leftover conflict marker, or something. Cannot attach patch 
(Issue attachment storage quota exceeded.), so pasting instead:

diff -r a0f9f337da7d jni/ozfdecoder.cpp
--- a/jni/ozfdecoder.cpp    Mon Jan 23 15:59:45 2012 +0400
+++ b/jni/ozfdecoder.cpp    Thu Feb 23 02:02:50 2012 +0200
@@ -113,7 +113,7 @@
    // convert to rgb
    int tile_z = OZF_TILE_WIDTH * (OZF_TILE_HEIGHT - 1) * 4;
    int tile_x = 0;

---
+
    jbyte* palette = (jbyte *) env->GetPrimitiveArrayCritical(p, (jboolean *)0);

    for(int j = 0; j < OZF_TILE_WIDTH * OZF_TILE_HEIGHT; j++)

Btw, thanks for releasing the source under GPLv3! Way to go, especially 
considering what's written on the frontpage - Ozi folks may try to stop such 
projects, but you make it truly community one, great response! Anyway, I see 
that there's 1.4.1 now available, will there be code updates?

Original issue reported on code.google.com by paul.sok...@linaro.org on 23 Feb 2012 at 12:49

berlog / androzic

ozfdecoder.cpp compile error (a0f9f337da7d, current tip) #228