Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(816)

Unified Diff: java/org/libjpegturbo/turbojpeg/TJLoader.java.in

Issue 1934113002: Update libjpeg_turbo to 1.4.90 from https://github.com/libjpeg-turbo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: java/org/libjpegturbo/turbojpeg/TJLoader.java.in
diff --git a/bmp.h b/java/org/libjpegturbo/turbojpeg/TJLoader.java.in
similarity index 85%
copy from bmp.h
copy to java/org/libjpegturbo/turbojpeg/TJLoader.java.in
index c50c260ee615426cf16e06d5a437a00add098940..83977806e48bb796b590191098283e9d5666c3e2 100644
--- a/bmp.h
+++ b/java/org/libjpegturbo/turbojpeg/TJLoader.java.in
@@ -26,17 +26,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __BMP_H__
-#define __BMP_H__
+package org.libjpegturbo.turbojpeg;
-#include "./turbojpeg.h"
-
-int loadbmp(char *filename, unsigned char **buf, int *w, int *h, int pf,
- int bottomup);
-
-int savebmp(char *filename, unsigned char *buf, int w, int h, int pf,
- int bottomup);
-
-const char *bmpgeterr(void);
-
-#endif
+final class TJLoader {
+ static void load() {
+ System.loadLibrary("@TURBOJPEG_DLL_NAME@");
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698