[SCM] Rasmol packaging branch, master, updated. debian/2.7.4.2-5-46-g613b8f6
Teemu Ikonen
tpikonen at gmail.com
Wed Sep 28 15:12:40 UTC 2011
The following commit has been merged in the master branch:
commit ed9b88db5a49d503bbf86945f22a00b023353e21
Merge: 6f1b244546b177141e0c6589a4e6e54fb042fb0f 0e65c857800f66c3fa254e27c27c9a8566d16b68
Author: Teemu Ikonen <tpikonen at gmail.com>
Date: Tue Sep 27 22:57:03 2011 +0200
Merge upstream version 2.7.5.2 and updated patches.
diff --combined src/Imakefile
index a7047c9,b5a88dd..83dddea
--- a/src/Imakefile
+++ b/src/Imakefile
@@@ -1,8 -1,8 +1,8 @@@
- # #define NEARTREE_LOCAL
-#define CBFLIB_LOCAL
-#define CQRLIB_LOCAL
-#define CVECTOR_LOCAL
-#define NEARTREE_LOCAL
-#define XFORMSLIB_LOCAL
++# #define CBFLIB_LOCAL
+# #define CQRLIB_LOCAL
+# #define CVECTOR_LOCAL
++# #define NEARTREE_LOCAL
+# #define XFORMSLIB_LOCAL
- # #define CBFLIB_LOCAL
###########################################################################
# RasMol 2.7.5 #
# #
@@@ -124,7 -124,7 +124,7 @@@ DEPTHDEF = -DTHIRTYTWOBI
LOCALEDEF =
#endif
-PKGDIR = $(HOME)
+PKGDIR = /usr
#ifndef GTKWIN
#define X11WIN
@@@ -185,7 -185,7 +185,7 @@@ XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_D
# Definitions for CBFLIB
#
#ifdef CBFLIB_LOCAL
- CBFLIB_VERSION = 0.8.1
+ CBFLIB_VERSION = 0.9.2
CBFLIB_TARBALL = CBFlib-$(CBFLIB_VERSION).tar.gz
CBFLIB_TARBALLDIR = $(EXTPKGDIR)
CBFLIB_TARBALL_URL = http://downloads.sf.net/cbflib/$(CBFLIB_TARBALL)
@@@ -197,7 -197,7 +197,7 @@@ CBFLIB_OBJDEP = $(CBFLIB_DIR)/lib/libcb
ifeq ($(strip $(CBFLIB_DIR)),)
CBFLIB_DIR = $(PKGDIR)
endif
-CBFLIB_INCLUDE_DIR = $(CBFLIB_DIR)/include/cbflib
+CBFLIB_INCLUDE_DIR = $(CBFLIB_DIR)/include/cbf
CBFLIB_LDLIB = -L$(CBFLIB_DIR)/lib -lcbf
CBFLIB_OBJDEP =
#define NO_CBFLIB_BUILD
@@@ -206,7 -206,7 +206,7 @@@
# Definitions for CQRLIB
#
#ifdef CQRLIB_LOCAL
- CQRLIB_VERSION = 1.0.3
+ CQRLIB_VERSION = 1.1.2
CQRLIB_TARBALL = CQRlib-$(CQRLIB_VERSION).tar.gz
CQRLIB_TARBALLDIR = $(EXTPKGDIR)
CQRLIB_TARBALL_URL = http://downloads.sf.net/cqrlib/$(CQRLIB_TARBALL)
@@@ -252,14 -252,14 +252,14 @@@ CVECTOR_OBJDEP
# Definitions for NEARTREE
#
#ifdef NEARTREE_LOCAL
- NEARTREE_VERSION = 2.1.3
+ NEARTREE_VERSION = 3.1
NEARTREE_TARBALL = NearTree-$(NEARTREE_VERSION).tar.gz
NEARTREE_TARBALLDIR = $(EXTPKGDIR)
NEARTREE_TARBALL_URL = http://downloads.sf.net/neartree/$(NEARTREE_TARBALL)
NEARTREE_DIR = $(NEARTREE_TARBALLDIR)/NearTree-$(NEARTREE_VERSION)
NEARTREE_INCLUDE_DIR = $(NEARTREE_DIR)
NEARTREE_LDLIB = $(NEARTREE_DIR)/CNearTree.o
- NEARTREE_SRC = $(NEARTREE_DIR)/CNearTree.c
+ NEARTREE_SRC = -DCNEARTREE_FORCEFLIP $(NEARTREE_DIR)/CNearTree.c
NEARTREE_OBJDEP = $(NEARTREE_DIR)/CNearTree.o
#else
ifeq ($(strip $(NEARTREE_DIR)),)
@@@ -276,7 -276,7 +276,7 @@@ NEARTREE_OBJDEP
# RasMol's on-line help direcory
# e.g. /usr/local/lib/rasmol/rasmol.hlp
-RASMOLDIR = $(USRLIBDIR)/rasmol/
+RASMOLDIR = /usr/share/rasmol/
#ifndef USE_XFORMSLIB
@@@ -332,23 -332,23 +332,23 @@@ LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRA
#
#ifdef HPArchitecture
-CCOPTIONS = -Ae
-CDEBUGFLAGS = +O2 +Onolimit
+#CCOPTIONS = -Ae
+#CDEBUGFLAGS = -O2 # -Onolimit
#ifdef HPUX_PARISC_32
-CCOPTIONS = -Ae +DA2.0 +DS2.0
+#CCOPTIONS = -Ae -DA2.0 -DS2.0
#endif
#ifdef HPUX_PARISC_64
-CCOPTIONS = -Ae +DA2.0W +DS2.0 -D_LONGLONG
+#CCOPTIONS = -Ae -DA2.0W -DS2.0 -D_LONGLONG
#endif
#ifdef HPUX_IA64_32
-CCOPTIONS = -Ae +DD32 +DSmckinley
+#CCOPTIONS = -Ae -DD32 -DSmckinley
#endif
#ifdef HPUX_IA64_64
-CCOPTIONS = -Ae +DD64 +DSmckinley -D_LONGLONG
+#CCOPTIONS = -Ae -DD64 -DSmckinley -D_LONGLONG
#endif
#endif
diff --combined src/gtkwin.c
index 0191bc7,f5b70ac..0696c70
--- a/src/gtkwin.c
+++ b/src/gtkwin.c
@@@ -155,7 -155,7 +155,7 @@@ enum
RES_150,
RES_300
};
-int print_resolution = RES_CURRENT;
+uintptr_t print_resolution = RES_CURRENT;
GtkPrintSettings *print_settings = NULL;
GtkPageSetup *print_pagesetup = NULL;
@@@ -392,116 -392,109 +392,116 @@@ void save_cb(GtkAction *action, gpointe
gtk_widget_destroy (dialog);
}
+
/* Render the current image to a given memory buffer with a given size */
-void render_buffer(Pixel *buf, int xsize, int ysize)
-{
- Pixel *old_fbuffer;
- int old_xrange, old_yrange, old_hrange, old_wrange, old_range, old_interactive, dx;
-
- old_fbuffer = FBuffer;
- old_xrange = XRange;
- old_yrange = YRange;
- FBuffer = buf;
- XRange = xsize;
- YRange = ysize;
-
- if( (dx = XRange%4) )
- XRange += 4-dx;
-
- old_hrange = HRange;
- old_wrange = WRange;
- old_range = Range;
- HRange = YRange>>1;
- WRange = XRange>>1;
- Range = MinFun(XRange,YRange);
-
- ReDrawFlag |= RFReSize;
- old_interactive = Interactive;
- Interactive = False;
- RefreshScreen(); // *buf now contains the image
- Interactive = old_interactive;
-
- FBuffer = old_fbuffer;
- XRange = old_xrange;
- YRange = old_yrange;
- HRange = old_hrange;
- WRange = old_wrange;
- Range = old_range;
-
- ReDrawFlag |= RFReSize;
- RefreshScreen();
- ReDrawFlag = NextReDrawFlag;
+void render_buffer(Pixel * buf, int xsize, int ysize)
+{
+ int old_xrange, old_yrange, old_hrange, old_wrange, old_range,
+ old_interactive, dx;
+
+ old_xrange = XRange;
+ old_yrange = YRange;
+ XRange = xsize;
+ YRange = ysize;
+ if ((dx = XRange % 4))
+ XRange += 4 - dx;
+
+ old_hrange = HRange;
+ old_wrange = WRange;
+ old_range = Range;
+ HRange = YRange >> 1;
+ WRange = XRange >> 1;
+ Range = MinFun(XRange, YRange);
+
+ ReDrawFlag |= RFReSize;
+ old_interactive = Interactive;
+ Interactive = False;
+ RefreshScreen(); // FBuffer now contains the image
+ memcpy(buf, FBuffer, sizeof(Pixel) * xsize * ysize);
+
+ Interactive = old_interactive;
+
+ XRange = old_xrange;
+ YRange = old_yrange;
+ HRange = old_hrange;
+ WRange = old_wrange;
+ Range = old_range;
+
+ ReDrawFlag |= RFReSize;
+ RefreshScreen();
+ ReDrawFlag = NextReDrawFlag;
}
+
gboolean sizespin_cb(GtkSpinButton button, gpointer data)
{
- GtkLabel *header = NULL;
- char header_str[128];
-
- if(gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(gtk_builder_get_object(sizebuilder, "size_custom"))))
- {
- export_x = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(gtk_builder_get_object(sizebuilder, "custom_x")));
- export_y = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(gtk_builder_get_object(sizebuilder, "custom_y")));
-
- header = GTK_LABEL(gtk_builder_get_object(sizebuilder, "size_header"));
- snprintf(header_str, 127, "Size: %d x %d", export_x, export_y);
- gtk_label_set_text(header, header_str);
- }
-
- return FALSE;
+ GtkLabel *header = NULL;
+ char header_str[128];
+
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(sizebuilder, "size_custom")))) {
+ export_x =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (sizebuilder, "custom_x")));
+ export_y =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (sizebuilder, "custom_y")));
+
+ header = GTK_LABEL(gtk_builder_get_object(sizebuilder, "size_header"));
+ snprintf(header_str, 127, "Size: %d x %d", export_x, export_y);
+ gtk_label_set_text(header, header_str);
+ }
+
+ return FALSE;
}
-gboolean sizeradio_cb(GtkButton *button, gpointer data)
+
+gboolean sizeradio_cb(GtkButton * button, gpointer data)
{
- int radioid;
- GtkLabel *header = NULL;
- char header_str[128];
-
- radioid = (int) data;
-
- export_x = XRange;
- export_y = YRange;
-
- switch(radioid) {
- case RADIO_CURRENT:
- break;
- case RADIO_640:
- export_x = 640;
- export_y = 480;
- break;
- case RADIO_1024:
- export_x = 1024;
- export_y = 768;
- break;
- case RADIO_1600:
- export_x = 1600;
- export_y = 1200;
- break;
- case RADIO_CUSTOM:
- export_x = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(gtk_builder_get_object(sizebuilder, "custom_x")));
- export_y = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(gtk_builder_get_object(sizebuilder, "custom_y")));
- break;
- default:
- ;
- }
-
- header = GTK_LABEL(gtk_builder_get_object(sizebuilder, "size_header"));
- snprintf(header_str, 127, "Size: %d x %d", export_x, export_y);
- gtk_label_set_text(header, header_str);
-
- return FALSE;
+ GtkLabel *header = NULL;
+ char header_str[128];
+ uintptr_t radioid = (uintptr_t) data;
+
+ export_x = XRange;
+ export_y = YRange;
+
+ switch (radioid) {
+ case RADIO_CURRENT:
+ break;
+ case RADIO_640:
+ export_x = 640;
+ export_y = 480;
+ break;
+ case RADIO_1024:
+ export_x = 1024;
+ export_y = 768;
+ break;
+ case RADIO_1600:
+ export_x = 1600;
+ export_y = 1200;
+ break;
+ case RADIO_CUSTOM:
+ export_x =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (sizebuilder, "custom_x")));
+ export_y =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (sizebuilder, "custom_y")));
+ break;
+ default:
+ ;
+ }
+
+ header = GTK_LABEL(gtk_builder_get_object(sizebuilder, "size_header"));
+ snprintf(header_str, 127, "Size: %d x %d", export_x, export_y);
+ gtk_label_set_text(header, header_str);
+
+ return FALSE;
}
@@@ -567,119 -560,101 +567,119 @@@ void build_exportdialog(void
}
-void export_cb(GtkAction *action, gpointer user_data)
+
+void export_cb(GtkAction * action, gpointer user_data)
{
- static char *fname = NULL;
+ static char *fname = NULL;
- if(!exportdialog) {
- build_exportdialog();
- }
- if(fname) {
- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (exportdialog), fname);
- gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER (exportdialog));
- }
- if(gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(gtk_builder_get_object(sizebuilder, "size_current"))))
- {
- GtkLabel *header = NULL;
- char header_str[128];
-
- export_x = XRange;
- export_y = YRange;
- header = GTK_LABEL(gtk_builder_get_object(sizebuilder, "size_header"));
- snprintf(header_str, 127, "Size: %d x %d", export_x, export_y);
- gtk_label_set_text(header, header_str);
- }
- while(TRUE) {
- GtkWidget *question;
- GdkPixbuf *pbuf;
- GError *err = NULL;
- gboolean success = TRUE;
- guint format = 0;
- gchar *formatname = NULL;
- GSList *tmplist = NULL;
- guchar *tmpbuf;
-
- if (gtk_dialog_run (GTK_DIALOG (exportdialog)) != GTK_RESPONSE_ACCEPT) {
- break;
- }
-
- if(fname) {
- g_free (fname);
- }
- fname = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (exportdialog));
- if(g_file_test(fname, G_FILE_TEST_EXISTS)) {
- gint resp;
- question = gtk_message_dialog_new(GTK_WINDOW(exportdialog),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
- "A file named \"%s\" already exists. Do you want to replace it?",
- fname);
- resp = gtk_dialog_run(GTK_DIALOG(question));
- gtk_widget_destroy (question);
- if(resp != GTK_RESPONSE_YES) {
- continue;
- }
- }
-
- format = egg_file_format_chooser_get_format (
- EGG_FILE_FORMAT_CHOOSER(format_chooser), fname);
- if(!format) {
- char *tmp;
- question = gtk_message_dialog_new(GTK_WINDOW(exportdialog),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
- "Could not recognise format of output file \"%s\", please choose another format.",
- ((tmp = rindex(fname, '/')) != NULL) ? (tmp+1) : (fname));
- gtk_dialog_run(GTK_DIALOG(question));
- gtk_widget_destroy (question);
- continue;
- }
- formatname = (gchar *) egg_file_format_chooser_get_format_data(
- EGG_FILE_FORMAT_CHOOSER(format_chooser), format);
-
- tmpbuf = g_new(guchar, 4*export_x*export_y);
- render_buffer((Pixel *) tmpbuf, export_x, export_y);
- pbuf = gdk_pixbuf_new_from_data(tmpbuf,
- GDK_COLORSPACE_RGB,
- TRUE, 8,
- export_x, export_y, 4*export_x,
- NULL, NULL);
- success = gdk_pixbuf_save(pbuf, fname, formatname, &err, NULL);
-
- if(!success && (err != NULL) ) {
- question = gtk_message_dialog_new(GTK_WINDOW(exportdialog),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "Error saving image: %s",
- err->message);
- gtk_dialog_run(GTK_DIALOG(question));
- gtk_widget_destroy (question);
- }
- g_object_unref(pbuf);
- g_free(tmpbuf);
- break;
- }
- gtk_widget_hide (exportdialog);
+ if (!exportdialog) {
+ build_exportdialog();
+ }
+ if (fname) {
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(exportdialog), fname);
+ gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(exportdialog));
+ }
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object(sizebuilder, "size_current")))) {
+ GtkLabel *header = NULL;
+ char header_str[128];
+
+ export_x = XRange;
+ export_y = YRange;
+ header = GTK_LABEL(gtk_builder_get_object(sizebuilder, "size_header"));
+ snprintf(header_str, 127, "Size: %d x %d", export_x, export_y);
+ gtk_label_set_text(header, header_str);
+ }
+ while (TRUE) {
+ GtkWidget *question;
+ GdkPixbuf *pbuf;
+ GError *err = NULL;
+ gboolean success = TRUE;
+ guint format = 0;
+ gchar *formatname = NULL;
+ GSList *tmplist = NULL;
+ Pixel *tmpbuf;
+
+ if (gtk_dialog_run(GTK_DIALOG(exportdialog)) != GTK_RESPONSE_ACCEPT) {
+ break;
+ }
+
+ if (fname) {
+ g_free(fname);
+ }
+ fname = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(exportdialog));
+ if (g_file_test(fname, G_FILE_TEST_EXISTS)) {
+ gint resp;
+ question = gtk_message_dialog_new(GTK_WINDOW(exportdialog),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_YES_NO,
+ "A file named \"%s\" already exists. Do you want to replace it?",
+ fname);
+ resp = gtk_dialog_run(GTK_DIALOG(question));
+ gtk_widget_destroy(question);
+ if (resp != GTK_RESPONSE_YES) {
+ continue;
+ }
+ }
+
+ format =
+ egg_file_format_chooser_get_format(EGG_FILE_FORMAT_CHOOSER
+ (format_chooser), fname);
+ if (!format) {
+ char *tmp;
+ question = gtk_message_dialog_new(GTK_WINDOW(exportdialog),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_OK,
+ "Could not recognise format of output file \"%s\", please choose another format.",
+ ((tmp =
+ rindex(fname,
+ '/')) !=
+ NULL) ? (tmp + 1) : (fname));
+ gtk_dialog_run(GTK_DIALOG(question));
+ gtk_widget_destroy(question);
+ continue;
+ }
+ formatname =
+ (gchar *)
+ egg_file_format_chooser_get_format_data(EGG_FILE_FORMAT_CHOOSER
+ (format_chooser), format);
+
+ tmpbuf = g_new(Pixel, export_x * export_y);
+ render_buffer(tmpbuf, export_x, export_y);
+ pbuf = gdk_pixbuf_new_from_data((guchar *) tmpbuf,
+ GDK_COLORSPACE_RGB,
+ TRUE, 8,
+ export_x, export_y,
+ sizeof(Pixel) * export_x,
+ NULL, NULL);
+ // Use TIFF compression 5 = LZW
+ success = gdk_pixbuf_save(pbuf, fname, formatname, &err,
+ "compression", "5", NULL);
+
+ if (!success && (err != NULL)) {
+ question = gtk_message_dialog_new(GTK_WINDOW(exportdialog),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_OK,
+ "Error saving image: %s",
+ err->message);
+ gtk_dialog_run(GTK_DIALOG(question));
+ gtk_widget_destroy(question);
+ }
+ g_object_unref(pbuf);
+ g_free(tmpbuf);
+ break;
+ }
+ gtk_widget_hide(exportdialog);
}
+
void pagesetup_cb(GtkAction *action, gpointer user_data)
{
if (print_pagesetup == NULL) {
@@@ -760,25 -735,21 +760,25 @@@ void print_draw(GtkPrintOperation *prin
g_free(tmpbuf);
}
-void print_get_res_cb(GtkPrintOperation *print, GtkWidget *widget, gpointer rb)
+
+void print_get_res_cb(GtkPrintOperation * print, GtkWidget * widget,
+ gpointer rb)
{
- GSList *el;
-
- el = gtk_radio_button_get_group(*((GtkRadioButton **)rb));
- while(el != NULL) {
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(el->data))) {
- print_resolution = (int) g_object_get_data(G_OBJECT(el->data), "res");
- return;
- } else
- el = el->next;
- }
- return;
+ GSList *el;
+
+ el = gtk_radio_button_get_group(*((GtkRadioButton **) rb));
+ while (el != NULL) {
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(el->data))) {
+ print_resolution =
+ (uintptr_t) g_object_get_data(G_OBJECT(el->data), "res");
+ return;
+ } else
+ el = el->next;
+ }
+ return;
}
+
GObject *print_build_reswidget_cb(GtkPrintOperation *operation, gpointer radio_p)
{
GtkBuilder *b = NULL;
@@@ -1493,16 -1464,16 +1493,16 @@@ gboolean button_release_cb(GtkWidget *c
if (!dragging && event->button == 3 && event->type == GDK_BUTTON_RELEASE
&& !(event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK))) {
- do_popup_menu (canvas, event);
+ do_popup_menu (canvas, event);
} else {
- stat = GetStatus(event->state);
- ProcessMouseUp(event->x,event->y,stat);
- }
+ stat = GetStatus(event->state);
+ ProcessMouseUp(event->x,event->y,stat);
+ }
if( ReDrawFlag ) {
RefreshScreen();
}
- dragging = FALSE;
-
+ dragging = FALSE;
+
return TRUE;
}
@@@ -1714,12 -1685,12 +1714,12 @@@ int CreateImage( void
long size;
if(FBuffer) {
- _ffree(FBuffer);
+ _ffree(FBuffer);
}
- size = (long)XRange*YRange*sizeof(Pixel);
- FBuffer = (Pixel*)_fmalloc( size+32 );
-
- return((FBuffer!=(Pixel*)NULL)?True : False);
+ size = (long)XRange*YRange*sizeof(Pixel);
+ FBuffer = (Pixel*)_fmalloc( size+32 );
+
+ return((FBuffer!=(Pixel*)NULL)?True : False);
}
diff --combined src/rasmol.h
index 4f2ac74,94e3640..b6cde5e
--- a/src/rasmol.h
+++ b/src/rasmol.h
@@@ -78,7 -78,6 +78,7 @@@
/* rasmol.h
*/
+#include <stdint.h>
/*===========================*/
/* User Definable Options! */
@@@ -187,9 -186,9 +187,9 @@@
/*==============================*/
#define MAIN_COPYRIGHT "Copyright (C) Roger Sayle 1992-1999"
- #define VERSION "2.7.5"
- #define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2008"
- #define VER_DATE "June 2009"
+ #define VERSION "2.7.5.2"
+ #define VER_COPYRIGHT "Copyright (C) Herbert J. Bernstein 1998-2011"
+ #define VER_DATE "May 2011"
#ifndef True
#define True 1
@@@ -203,7 -202,7 +203,7 @@@
typedef double Real;
#ifndef APPLEMAC
-typedef unsigned char Byte;
+typedef uint8_t Byte;
#endif
#ifdef __STDC__
@@@ -212,18 -211,21 +212,18 @@@ typedef signed char Char
typedef char Char;
#endif
-#ifdef _LONGLONG
-typedef unsigned int Card;
-typedef int Long;
-#else
-typedef unsigned long Card;
+typedef uint32_t Card;
+/* Long has to be defined as long, instead of int32_t because of
+ multiple printf and scanf calls using %ld in the format. */
typedef long Long;
-#endif
#ifdef EIGHTBIT
-typedef unsigned char Pixel;
+typedef uint8_t Pixel;
#else
#ifdef THIRTYTWOBIT
-typedef Long Pixel;
+typedef int32_t Pixel;
#else
-typedef short Pixel;
+typedef int16_t Pixel;
#endif
#endif
@@@ -247,6 -249,7 +247,7 @@@
#define ToUpper(x) (islower((x))?toupper((x)):(x))
#endif
+
#if !defined(IBMPC) || defined(_WIN32)
#ifdef APPLEMAC
#define _fmalloc NewPtrSys
--
Rasmol packaging
More information about the debian-science-commits
mailing list