Changeset 1520

Timestamp:

Aug 12, 2004, 2:02:03 PM (22 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src

Files:

• Makefile.Globals (modified) (3 diffs)
• image/psImageManip.c (modified) (2 diffs)

trunk/psLib/src/Makefile.Globals

@@ -5 +5 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.13 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-08-03 20:42:30 $
+##  $Revision: 1.14 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-08-13 00:02:03 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
 # Set initial value for CFLAGS which will include all OS common flags for GCC
 
-CFLAGS := -O0 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -pipe
+CFLAGS := -O0 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -DFORTRAN_UNDERLINE_SUFFIX -pipe
 
 ifdef NO_TRACE
@@ -50 +50 @@
 # Set initial value for LDFLAGS which will include all OS common flags for GCC and required libraries.
 
-EXTLIBS := -lcfitsio -lgsl -lgslcblas -lfftw3f
+EXTLIBS := -lcfitsio -lgsl -lgslcblas -lfftw3f -lsla
 LDFLAGS := -g2 -pipe $(EXTLIBS) 
 

trunk/psLib/src/image/psImageManip.c

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-12 03:05:48 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-13 00:02:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -705 +705 @@
         // (x-centerX)*sinT;
 
-        int outCols = round(abs(numCols * cosT) + abs(numRows * sinT)) + 1;
-        int outRows = round(abs(numCols * sinT) + abs(numRows * cosT)) + 1;
+        int outCols = ceil(abs(numCols * cosT) + abs(numRows * sinT)) + 1;
+        int outRows = ceil(abs(numCols * sinT) + abs(numRows * cosT)) + 1;
         float minX = (float)outCols / -2.0f;
         int intMinY = outRows / -2;