From 7963c22de093ac40e62a44cacb13f0b2fed19aa4 Mon Sep 17 00:00:00 2001
From: Martin Lambers <marlam@marlam.de>
Date: Wed, 07 Jan 2015 19:48:01 +0000
Subject: gta from-netpbm, to-netpbm: fix for 64 bit builds

---
diff --git a/gtatool/src/conv-netpbm/from-netpbm.cpp b/gtatool/src/conv-netpbm/from-netpbm.cpp
index 53aca1a..d3fd97f 100644
--- a/gtatool/src/conv-netpbm/from-netpbm.cpp
+++ b/gtatool/src/conv-netpbm/from-netpbm.cpp
@@ -2,7 +2,7 @@
  * This file is part of gtatool, a tool to manipulate Generic Tagged Arrays
  * (GTAs).
  *
- * Copyright (C) 2010, 2011, 2012, 2013
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015
  * Martin Lambers <marlam@marlam.de>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -98,7 +98,7 @@ extern "C" int gtatool_from_netpbm(int argc, char *argv[])
             tuple *tuplerow;
 
             pm_init("gta from-netpbm", 0);
-#ifdef PAM_STRUCT_SIZE
+#if 0
             pnm_readpaminit(fi, &inpam, PAM_STRUCT_SIZE(tuple_type));
 #else
             pnm_readpaminit(fi, &inpam, sizeof(struct pam));
diff --git a/gtatool/src/conv-netpbm/to-netpbm.cpp b/gtatool/src/conv-netpbm/to-netpbm.cpp
index 7f68e7e..436d390 100644
--- a/gtatool/src/conv-netpbm/to-netpbm.cpp
+++ b/gtatool/src/conv-netpbm/to-netpbm.cpp
@@ -2,7 +2,7 @@
  * This file is part of gtatool, a tool to manipulate Generic Tagged Arrays
  * (GTAs).
  *
- * Copyright (C) 2010, 2011, 2012, 2013
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015
  * Martin Lambers <marlam@marlam.de>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -121,7 +121,7 @@ extern "C" int gtatool_to_netpbm(int argc, char *argv[])
             struct pam outpam;
             std::memset(&outpam, 0, sizeof(outpam));
             outpam.size = sizeof(struct pam);
-#ifdef PAM_STRUCT_SIZE
+#if 0
             outpam.len = PAM_STRUCT_SIZE(tuple_type);
 #else
             outpam.len = outpam.size;
--
cgit v0.9.0.2