From 6b931875acfd54ef35de6926c5cf4552e06e8443 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Mon, 20 May 2013 17:03:35 -0700
Subject: [PATCH] swig/java: reduce wrapper function code duplication

define a macro to emit the wrapper code

Change-Id: I672416016162d6d9ce6f455d224044e0837e3ace
(cherry picked from commit a5c297c842c96e899725328378ff14400176458b)
---
 swig/libwebp.i   |  68 ++++++++++++++++-------------------------------
 swig/libwebp.jar | Bin 2143 -> 3099 bytes
 2 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/swig/libwebp.i b/swig/libwebp.i
index 0cb7ccce..b541c3f9 100644
--- a/swig/libwebp.i
+++ b/swig/libwebp.i
@@ -273,57 +273,35 @@ LOSSLESS_WRAPPER(WebPEncodeLosslessBGRA)
 %pragma(java) modulecode=%{
   private static final int UNUSED = 1;
   private static int outputSize[] = { 0 };
+%}
 
-  public static byte[] WebPEncodeRGB(byte[] rgb,
-                                     int width, int height, int stride,
-                                     float quality_factor) {
-    return wrap_WebPEncodeRGB(
+
+%define CALL_ENCODE_LOSSY_WRAPPER(func)
+%pragma(java) modulecode=%{
+  public static byte[] func(
+      byte[] rgb, int width, int height, int stride, float quality_factor) {
+    return wrap_##func(
         rgb, UNUSED, UNUSED, outputSize, width, height, stride, quality_factor);
   }
+%}
+%enddef
 
-  public static byte[] WebPEncodeBGR(byte[] bgr,
-                                     int width, int height, int stride,
-                                     float quality_factor) {
-    return wrap_WebPEncodeBGR(
-        bgr, UNUSED, UNUSED, outputSize, width, height, stride, quality_factor);
-  }
-
-  public static byte[] WebPEncodeRGBA(byte[] rgba,
-                                      int width, int height, int stride,
-                                      float quality_factor) {
-    return wrap_WebPEncodeRGBA(
-        rgba, UNUSED, UNUSED, outputSize, width, height, stride, quality_factor);
-  }
-
-  public static byte[] WebPEncodeBGRA(byte[] bgra,
-                                      int width, int height, int stride,
-                                      float quality_factor) {
-    return wrap_WebPEncodeBGRA(
-        bgra, UNUSED, UNUSED, outputSize, width, height, stride, quality_factor);
-  }
-
-  public static byte[] WebPEncodeLosslessRGB(
+%define CALL_ENCODE_LOSSLESS_WRAPPER(func)
+%pragma(java) modulecode=%{
+  public static byte[] func(
       byte[] rgb, int width, int height, int stride) {
-    return wrap_WebPEncodeLosslessRGB(
+    return wrap_##func(
         rgb, UNUSED, UNUSED, outputSize, width, height, stride);
   }
-
-  public static byte[] WebPEncodeLosslessBGR(
-      byte[] bgr, int width, int height, int stride) {
-    return wrap_WebPEncodeLosslessBGR(
-        bgr, UNUSED, UNUSED, outputSize, width, height, stride);
-  }
-
-  public static byte[] WebPEncodeLosslessRGBA(
-      byte[] rgba, int width, int height, int stride) {
-    return wrap_WebPEncodeLosslessRGBA(
-        rgba, UNUSED, UNUSED, outputSize, width, height, stride);
-  }
-
-  public static byte[] WebPEncodeLosslessBGRA(
-      byte[] bgra, int width, int height, int stride) {
-    return wrap_WebPEncodeLosslessBGRA(
-        bgra, UNUSED, UNUSED, outputSize, width, height, stride);
-  }
 %}
+%enddef
+
+CALL_ENCODE_LOSSY_WRAPPER(WebPEncodeRGB)
+CALL_ENCODE_LOSSY_WRAPPER(WebPEncodeRGBA)
+CALL_ENCODE_LOSSY_WRAPPER(WebPEncodeBGR)
+CALL_ENCODE_LOSSY_WRAPPER(WebPEncodeBGRA)
+CALL_ENCODE_LOSSLESS_WRAPPER(WebPEncodeLosslessRGB)
+CALL_ENCODE_LOSSLESS_WRAPPER(WebPEncodeLosslessRGBA)
+CALL_ENCODE_LOSSLESS_WRAPPER(WebPEncodeLosslessBGR)
+CALL_ENCODE_LOSSLESS_WRAPPER(WebPEncodeLosslessBGRA)
 #endif  /* SWIGJAVA */
diff --git a/swig/libwebp.jar b/swig/libwebp.jar
index 602f037ce69ec88363f3f4f95526f880da7c8b3d..6cc574b2d8d163b9aade3b5857e0bc646398ea94 100644
GIT binary patch
literal 3099
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

delta 1564
zcmYjR2T+qq82yEiKmsD2Py>-JMVbN<Izvc6n#fT+mHd$+O(Ig1VALp02%&{0B~m<^
z0X3t522s(_>j9pJItoMuLEtE!94P4RH@n~4Z)d;VnK$nh%Kp7)w;PThA_)j?hVI#U
zYuav8*bc-wna?1nE2pNarkK23hGr1^5(8cm_dLF!#lOWLaKpg_`%so^)&Kz5Z_ceo
z@XZVWAI|h+Xx;L#9XO}D1L?B6G<N#a9e3%I$2=r#B&i!J@<{a)Mkwqav9WTMq$C!5
z?`i0M)Wt^on^^}>RvXxXH0}EHD1CoD<~}a$bJ@OL2L7TkKC5O;<FBcWwZ)m)87ngR
z8`R+X1*A;}SUV}e)#l=IAzV4GIaeoFBzG@Yohyw?0Sm#aU>?|;4h$G#vp_mXPE~ut
z>SjG=aamLCp)#+WBE!}0W~Cy;nQTaJOMT7@WL?n<N$p$d@3pa+OU|oo57+mHj|hnb
zv&^OzeA~X-Q^JA{s&Oz44=dchgdFpf$f>CHec44o485K3Zu-CtiL>dZRpfi5-fXEy
z%BBwx9N&&76tjeH2I|bjn)j%XMX%l(dU__Uc8X(srzNkvAE)U4ctcs)?-iR+8nbwk
zm^%KBai>_)=-IkLtz%k$OSYx!^O<`Dyfq1FHr`O)|3~ZaVq)33Bl<b;kQ%SzuMXzu
z!kn>Axke?e5XHKlcJz>zd~&y(rET1?+lCE3*}dgT=g#^B4uu|iI<4p}MfR7dCWaPq
zrMf&dHI|(BSLwZ5?b5n(e%ZcTDMNvXAxbX3u17>j37>T07}&yRU$;>VxPrLLU^bYh
z`!=@pI0eiCQ{Jg4Y2_0cCm7(&6Gfq7vwt<ulzxB-n6#UriQz)JMV20&K``2#k7Wfq
zgQmXuN5!M$bggCh`T#5P{V0TZeA-A@XHoLE^_q+jl}}aP2U^wQEo`k&7vA+s@-tm4
znuNmjMw_AOm`90JYA<Eb&ed09a0~&nOtKh~m{on?(tIzg*t@qqd_(om3j|TWamDi1
z)Q{-gn5v*T^@NUrS@BP;1m!!;2U3<3Ss4NMsNqrW)Zo<VzWg4titzw{^JP9xWAAMA
zN>OpWQRkbL6XohWcNbL?$035HvsewbyprdxL@Q8F+1-W}dE_8E*;?8&DaCl!fgdFn
zIH)^!;lnB&2-3-ny6)x_d{GSPI?)G&28*l!##cWsM+6}t4=jSCCmb}feRT6a5wUUf
zbg*KlhAom(LLR<oZa>X$<KBU<zTwU3`F+WZM0FMG7i2Ufzm%jIsvt~gdSYg3gxl(G
zWN3%I76w)YMo$5xyfO0g2c{F_=bDp8{V62mc^qZ~wk5~}U3s(<KLGd${Sf3YWq()Z
z_JZ2Xfe~T)r|5GK9df_a{l?_bKo2h`A)8B3nSlJe*O^R`6Jo)?9`C;bV6x|9%*7C8
z*!Aw0(X&N`q&70<Au!43y7yYUySN<opn4{|Ss^sW0X2R|QT$p!lZ-QJv`Jz7#$jO|
zhDS}$S&%T9wIIdVxscd)ym;y8*g|KNn%8g~2w_%^@IuJ9D%U)o=27Zxs;-P!xjzmt
zWonmE+W*~H^DDOLOiBRF#_A+WYT1!XGfnzXxRq||j5hV{;Cues`>~F}tw(-qfX)x+
zgk;2(xLE4TCL*5=nlj=-!oFZ%5KZ!J<Bvy=GQ+qVN6jV-rHArk)_JQw<iWu`mkv@3
zPpf9g%8!w~mch7Sbml+ltU3$yYLBdEG*sl;q{I9TzP4Dt$uQ0lMQrALlPGGAjmqqZ
zpvZVK`TQEwpTM0m-{9@2MmqTtT?lDNYIy_1q6p*!a4b0&sw2GxLMbpzREl{bI&uZE
zMa{Q(<B_Oc05H$DMa?cgN#F-LkS*V(*9#dVwvBhoROz3D4*WDt9k|X<8~```iF4rx
zgtzZ}=bb(Vw?c0h{{Pw*-M<DGLjMd$Dm%Mk^#V_yh>mu{2|%|_VVm)A^M5JdcmDzM
C+n&(?