Skip to content

Commit

Permalink
fixed pixels buffer error release
Browse files Browse the repository at this point in the history
  • Loading branch information
ragnraok committed May 19, 2014
1 parent 40b5cf7 commit cabd713
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion library/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
android:versionCode="1"
android:versionName="0.1" >

<uses-sdk android:minSdkVersion="9" />
<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="19" />
</manifest>
4 changes: 2 additions & 2 deletions library/jni/ImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class ImageFilter {
this->pixels = _pixels; // avoid alloc redundant pixels buffer
};
virtual ~ImageFilter() {
if (pixels != NULL)
delete [] pixels;
// if (pixels != NULL)
// delete [] pixels;
pixels = NULL;
};
void setPixels(int *_pixels, int width, int height) {
Expand Down
2 changes: 2 additions & 0 deletions library/jni/Util.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
FilterClass filter(pixelsBuff, width, height, options); \
int *_result = filter.procImage(); \
result = jintPointerToJintArray(env, width * height, _result); \
releaseArray(env, pixels, pixelsBuff); \
result; \
})\

Expand All @@ -38,6 +39,7 @@
FilterClass filter(pixelsBuff, width, height); \
int *_result = filter.procImage(); \
result = jintPointerToJintArray(env, width * height, _result); \
releaseArray(env, pixels, pixelsBuff); \
result; \
})\

Expand Down
Binary file modified library/libs/armeabi-v7a/libAndroidImageFilter.so
Binary file not shown.
Binary file modified library/libs/armeabi/libAndroidImageFilter.so
Binary file not shown.
Binary file modified library/libs/mips/libAndroidImageFilter.so
Binary file not shown.
Binary file modified library/libs/x86/libAndroidImageFilter.so
Binary file not shown.

0 comments on commit cabd713

Please sign in to comment.