From 885609e8737940cb64f1543c1298550dbe4778b5 Mon Sep 17 00:00:00 2001
From: RoNor <ronoru@users.sourceforge.jp>
Date: Thu, 20 May 2010 00:48:16 +0900
Subject: [PATCH] =?utf8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E5=87=A6=E7=90=86?=
 =?utf8?q?=E8=BF=BD=E5=8A=A0=20createRGBSurfaceFrom=E3=81=AB=E6=B8=A1?=
 =?utf8?q?=E3=81=95=E3=82=8C=E3=82=8BByteBuffer=E3=81=8C=E3=83=80=E3=82=A4?=
 =?utf8?q?=E3=83=AC=E3=82=AF=E3=83=88=E3=83=90=E3=83=83=E3=83=95=E3=82=A1?=
 =?utf8?q?=E3=83=BC=E3=81=A7=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AB?=
 =?utf8?q?=E3=81=AF=E3=82=A8=E3=83=A9=E3=83=BC=E6=96=87=E3=82=92=E5=87=BA?=
 =?utf8?q?=E5=8A=9B=E3=81=97=E3=80=81=E3=83=8D=E3=82=A4=E3=83=86=E3=82=A3?=
 =?utf8?q?=E3=83=96=E9=96=A2=E6=95=B0=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA?=
 =?utf8?q?=E3=81=95=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
 =?utf8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 build/sdl/SDL$.class | Bin 8615 -> 8879 bytes
 build/sdl/SDL.class  | Bin 10276 -> 10276 bytes
 src/SDL.scala        |  10 +++++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/sdl/SDL$.class b/build/sdl/SDL$.class
index f0e14118993d68ffc91889b7a4b2a66069f467ce..dd7dc251964dc66b6d5a7c373e1fccdad887f73c 100644
GIT binary patch
delta 1719
zcmZ`&*;89p82`R3<mTRhG>`xSAyj1vZ7I;jLJMUt6r?n^KsR~`7YKv|Z-T;u<zH|-
zPkpLyeQ_x=H#l|1sgF9=`X6*0eQ@8kuGQbUp*m#7m-GA1`L^G;oSVIG^sDbby!{Rl
zwQyony{Bw2l`QJd>&?k{s<~%9WAv=f%^9YLzF|`0>AtvW#4=3IhQ<p%`i{O=>0A22
zM_<v`DrM*=refPWp(p2?qwDF6vFxE=U~iZvQ((kaBJvqCp3FourlBu)_~=*q%}WpH
zcc#vH7^ckja15%9adxmLx@ykpF=N0?Er&b9EAcfWkq*bx;bbZkp0(M8XFzktrg=c2
zKOYsaJBx=NGI>^H+C&me#7VVOJMUv+R_Skch)<L@m(w&dqSRa0!CqET4{J<XA{ATO
zA>rdfdQZL=F%_;RcWH`q9(%;9cg)KrTq^AX;;y%=zML!M<#8teY&^Y^(ANi2=CYpY
zPOL2GKCa5Ct3{i7NU7nlw5=5>^|<mRKP4}9VoPmQ8n{tjBH~k3R}OHqyc`sx+7;yp
zAC;G<#g^8u9Oo1A()qG)??w;zO1Y28J!>E>ldEC45mgWHpj4b<axABJ&1`ID5d-${
zX_ZGv^O2KWUh?uY7-6(;MBy`bNA%f|_>8HW>png!8~A{uPV7*zJi<6&P2>>wd?{^_
zTHrr|J}+$z6>b-9d_*c~uxsTBZdaSK^y763MYhRos;UmS0`5RTz!Ojc-YosxuHGc=
zP5Q(CSC*X>>MeLVs2OLF+&HIkUL_ytR8KLy8?=tsm0Wasfn2!BJT7*F5hS`pMUx02
z#doPll7zYdk~D2)4<s45l|F-1U`wAv^4QWBkQ7_`5|S5|`&ps8D2L^~i00}thi_Bd
zuMUX0stT9f75V0W>{U4Bco*0_7KC0Eaxpf>*84Z}^l_=Lkvjx)nL7%8lA&g|X<v1g
zgSUjMrY_87$S+IN=sw-HE7NEV?400)wX@?_{@1r${-s=g?47L-<?9nUJyy}y@6FdI
z#mA+=Bm4wiM{Z_p=?>3R$SZrQ=6GhgKEL#oI2bGoe6Yh>wPQFC1IsNcLlyp}e1{eB
zdR0(d3Tc6TC`*n`<NZ4Y;uDDR@>20q$m4IxcYID<D=!mwLh5iUx7m(`d<c0Zzd}BY
zHy85a>-^hew>|rv9@l31Sbj+J5tlCMp5xNa9SF&cZ})#q=*pk(8k!Ic@=3dY=oWWF
zl3l=m6|d9;%llsgNwzmVH?bF?#Ge%()|B~&^21$|<8bjXcZfaV%8k*;7LS$i_*?vJ
z#AQ)Sq=e5|)CM?j(P6-ZMMnXX799gjS=0fzV9^P{MT@#3PK&ywYj4D3Q9oWUSu_Z^
zY|#+libbaZ(-w_J+!l>NzG~4p0C}R5KqNW`K%xnNZqXEA#-fXWm_?TX$Tux>=rTkM
j53?2-0K=krz??;Kz`R9Ek+&%`wap8{S$o4BM`P$86^ui(

delta 1438
zcmZ8g-A@!(6hCKomYtoMMY=ewQ&^Toi!fp-1*H}#MO>|lP`mYmHWh|tK@gNI3k^>s
zeeHv3?o-o;zO^qlmFQiXHfi*+#@hd&Z%z7L?U(k;_IGDDjZP-Hzw>?Oocp^UX5Sw+
zZa(<<QzGi-S2m0<bi<<W=?8;K^rQGP)+3U}j(+-;ep8m;naqWY`SZDz;*6IsSahF0
zQ}#cY;wu*(@%&ZE_*<+RV=;O_|00e_+%^VxhFMcegefsSx4g9AtsS~pT=Ysq3rpub
zi=!2{E_%&g-C$G2T4KrEuW#Wxr939CnH_pPZ&ivdzA`=C;m4KIC`PTbdWKt-vRz!W
zvieSLS4xNAc<cIZeo`r2Op)mV`Z8(lM>|eg+|5rbM-NkIaha)Z-dpv$7Q73yU1L-8
zg?uT>dkyX*)1okGF^cg%rf}}yh|c|wMCaC)ONGTK5BQ7nrbp(cie3?Y?Dmm)Ph`zH
z6Ws>+d4r$hA#o}GhIxj%QLm4f$FDZkZpPQ&Ap;*#(%q!uuBMc&*%7<Oj@r5%E7MO`
z;0jR}&KhEzXK4-ROeKY0Ck+~s=?>lX{Ykn`wa8Gm8<4`j^fM$CnWSGJMSSUNNHw%w
z8NY!T^^M;`(tYVWNHLTI7sOjmGI4JM=7;}eLQFO{hv>ez<T!~xF9*Dn%BvB0;b;F7
z%=RjNFh#tXauOVzb4rY+8$uisw^NN_PzY5T>bWKumPeU%7#ynjV?qD4?+2|a{&>(o
zBkpW%u(+1q#;DAooS58Z+nr@j1Sgsm_nI?%Rb&W};3G2B(sJ0W+O1i=z%n-kQ_o?T
z%z-2}sxHRlZIHq!0v=b3OyE+~wZ#1*ox2^a%uT^Eb7CW%NvF8kFB9i9eeU0HoLgYi
zP!MlH+)X>79hb#>skRong$TtO(~qb$e}dcm=6EV<)^*J425)D{XIYD1-T0qn2JiCs
zL}YMhbq{!B)e&0MUeHTdBb5264<PeH%w56%;o()I2T)saGv=u9beVgD|FEjAM&mu)
zCY(&;`ZMlTezu<Xf5Zn|O;Wd8&%=^>00$-Q0c0ih0S-yp2RJOLAMk>t0l*PSgKk*T
zkV+kPqmr_)9+h+$a7@w>z=)({fa8*myAerakVhq*0H9Cq3=oY@0?_C*U`*0D;6+KV
y0!~PJ4S;?Vs)wga<Y9P8QUQ>YGz)lH(j4HVr1S14R2tvpQ^IV0H*y-Ap#K2F;``<R

diff --git a/build/sdl/SDL.class b/build/sdl/SDL.class
index d9df46e42afde453f858787487ebf1ce64b911af..f1ec075d5e25710d5d7d157280af8077100c765b 100644
GIT binary patch
delta 12
TcmZ1yuq0r^e|5&jNg65uCHe&)

delta 12
TcmZ1yuq0r^e|5&nNg65uCE5iS

diff --git a/src/SDL.scala b/src/SDL.scala
index 400e9fb..24806f1 100644
--- a/src/SDL.scala
+++ b/src/SDL.scala
@@ -91,7 +91,15 @@ package sdl {
     def setPalette(surface:SDL_Surface, flags:Int, colors:Array[SDL_Color], firstcolor:Int, ncolors:Int):Int = return sdl.setPalette(surface, flags, colors, firstcolor, ncolors)
     def mapRGB(fmt:SDL_PixelFormat, r:Int, g:Int, b:Int):Int = return sdl.mapRGB(fmt, r, g, b);
     def createRGBSurface(flags:Int, width:Int, height:Int, bitsPerPixel:Int, Rmask:Int, Gmask:Int, Bmask:Int, Amask:Int):SDL_Surface = sdl.createRGBSurface(flags, width, height, bitsPerPixel, Rmask, Gmask, Bmask, Amask)
-    def createRGBSurfaceFrom(pixels:java.nio.ByteBuffer, width:Int, height:Int, depth:Int, pitch:Int, Rmask:Int, Gmask:Int, Bmask:Int, Amask:Int):SDL_Surface = sdl.createRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask)
+    def createRGBSurfaceFrom(pixels:java.nio.ByteBuffer, width:Int, height:Int, depth:Int, pitch:Int, Rmask:Int, Gmask:Int, Bmask:Int, Amask:Int):SDL_Surface = {
+      var ret:SDL_Surface = null
+      if(pixels.isDirect()){
+        ret = sdl.createRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask)
+      }else{
+        System.err.println("error: createRGBSurfaceFrom > pixels is not direct bytebuffer.")
+      }
+      return ret
+    }
     def freeSurface(surface:SDL_Surface):Unit  = sdl.freeSurface(surface)
     def lockSurface(surface:SDL_Surface):Int = return sdl.lockSurface(surface)
     def unlockSurface(surface:SDL_Surface):Unit = return sdl.unlockSurface(surface)
-- 
2.11.0