--- deliantra/Deliantra-Client/Client.xs	2007/07/17 18:34:24	1.202
+++ deliantra/Deliantra-Client/Client.xs	2007/07/19 13:45:16	1.203
@@ -1260,39 +1260,24 @@
 int minpot (int n)
 
 void
-pad2pot (SV *data_, SV *w_, SV *h_)
+pad (SV *data_, int ow, int oh, int nw, int nh)
 	CODE:
 {
-        int ow = SvIV (w_);
-        int oh = SvIV (h_);
-
-        if (ow && oh)
+        if ((nw != ow || nh != oh) && SvOK (data_))
           {
-            int nw = minpot (ow);
-            int nh = minpot (oh);
-
-            if (nw != ow || nh != oh)
-              {
-                if (SvOK (data_))
-                  {
-                    STRLEN datalen;
-                    char *data = SvPVbyte (data_, datalen);
-                    int bpp = datalen / (ow * oh);
-                    SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
-
-                    SvPOK_only (result_);
-                    SvCUR_set (result_, nw * nh * bpp);
-
-                    memset (SvPVX (result_), 0, nw * nh * bpp);
-                    while (oh--)
-                      memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
-
-                    sv_setsv (data_, result_);
-                  }
+            STRLEN datalen;
+            char *data = SvPVbyte (data_, datalen);
+            int bpp = datalen / (ow * oh);
+            SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
+
+            SvPOK_only (result_);
+            SvCUR_set (result_, nw * nh * bpp);
+
+            memset (SvPVX (result_), 0, nw * nh * bpp);
+            while (oh--)
+              memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
 
-                sv_setiv (w_, nw);
-                sv_setiv (h_, nh);
-              }
+            sv_setsv (data_, result_);
           }
 }