GLXWorkstation.st
changeset 5479 ae6b3ac21920
parent 4718 11e89d5330e7
child 6002 3773c70bed6a
--- a/GLXWorkstation.st	Thu Nov 05 15:37:16 2009 +0100
+++ b/GLXWorkstation.st	Thu Nov 05 15:37:38 2009 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libview' }"
 
 XWorkstation subclass:#GLXWorkstation
@@ -3063,19 +3062,19 @@
      the floatArray props. Props must be delimited by a 0.0 entry."
 
 %{  /* NOCONTEXT */
-#ifdef GLX
+#ifdef GLX                          
     unsigned char *cp;
     const float *fp;
     OBJ cls;
     float fbuff[30];
 
-    if (__isByteArray(image)) {
-	cp = _ByteArrayInstPtr(image)->ba_element;
-	fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
-
-	SETWIN(aGLXWindowId)
-	texdef2d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
-		 (const unsigned long *)cp, __intVal(np), fp);
+    if (__isByteArrayLike(image)) {
+        cp = _ByteArrayInstPtr(image)->ba_element;
+        fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
+
+        SETWIN(aGLXWindowId)
+        texdef2d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
+                 (const unsigned long *)cp, __intVal(np), fp);
     }
 #endif
 %}
@@ -3095,14 +3094,14 @@
     OBJ cls;
     float fbuff[30];
 
-    if (__isByteArray(image)) {
-	cp = _ByteArrayInstPtr(image)->ba_element;
-	fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
-
-	SETWIN(aGLXWindowId)
-	texdef3d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
-		 __intVal(d),
-		 (const unsigned long *)cp, __intVal(np), fp);
+    if (__isByteArrayLike(image)) {
+        cp = _ByteArrayInstPtr(image)->ba_element;
+        fp = __glx_getFloatsFromFloatArrayInto(props, fbuff);
+
+        SETWIN(aGLXWindowId)
+        texdef3d(__intVal(index), __intVal(nc), __intVal(w), __intVal(h),
+                 __intVal(d),
+                 (const unsigned long *)cp, __intVal(np), fp);
     }
 #endif
 %}
@@ -8783,5 +8782,9 @@
 !GLXWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.84 2007-01-24 13:41:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.85 2009-11-05 14:37:38 stefan Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libview/GLXWorkstation.st,v 1.85 2009-11-05 14:37:38 stefan Exp $'
 ! !