[sword-svn] r3456 - in trunk: . include src/modules/lexdict/rawld4 src/modules/texts/rawtext4

[scribe at crosswire.org]

Author: scribe
Date: 2017-04-24 02:26:34 -0700 (Mon, 24 Apr 2017)
New Revision: 3456

Modified:
   trunk/configure.ac
   trunk/include/swversion.h
   trunk/src/modules/lexdict/rawld4/rawld4.cpp
   trunk/src/modules/texts/rawtext4/rawtext4.cpp
Log:
small bugfixes from Jaak Ristioja <jaak at ristioja.ee>
prepare for 1.8.x branch


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2017-04-24 08:50:31 UTC (rev 3455)
+++ trunk/configure.ac	2017-04-24 09:26:34 UTC (rev 3456)
@@ -5,7 +5,7 @@
 # Version change: Change line 8 only !
 # Change it immediately after a release
 
-AC_INIT(sword, 1.7.3, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
+AC_INIT(sword, 1.7.900, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
 AC_CONFIG_SRCDIR(sword.bmp)
 AC_PREREQ(2.52)
 AC_REVISION($Revision: 1.45 $)

Modified: trunk/include/swversion.h
===================================================================
--- trunk/include/swversion.h	2017-04-24 08:50:31 UTC (rev 3455)
+++ trunk/include/swversion.h	2017-04-24 09:26:34 UTC (rev 3456)
@@ -24,11 +24,11 @@
 #ifndef SWVERSION_H
 #define SWVERSION_H
 
-#define SWORD_VERSION_NUM 107003000
-#define SWORD_VERSION_STR "1.7.3"
+#define SWORD_VERSION_NUM 107900000
+#define SWORD_VERSION_STR "1.7.900"
 #define SWORD_VERSION_MAJOR 1
 #define SWORD_VERSION_MINOR 7
-#define SWORD_VERSION_MICRO 3
+#define SWORD_VERSION_MICRO 900
 #define SWORD_VERSION_NANO 0
 
 #include <defs.h>

Modified: trunk/src/modules/lexdict/rawld4/rawld4.cpp
===================================================================
--- trunk/src/modules/lexdict/rawld4/rawld4.cpp	2017-04-24 08:50:31 UTC (rev 3455)
+++ trunk/src/modules/lexdict/rawld4/rawld4.cpp	2017-04-24 09:26:34 UTC (rev 3456)
@@ -81,7 +81,7 @@
 	char *buf = new char [ strlen(*key) + 6 ];
 	strcpy(buf, *key);
 
-	strongsPad(buf);
+	if (strongsPadding) strongsPad(buf);
 
 	entryBuf = "";
 	if (!(retval = findOffset(buf, &start, &size, away))) {
@@ -199,7 +199,7 @@
 	char *buf = new char [ strlen(key) + 6 ];
 	strcpy(buf, key);
 
-	strongsPad(buf);
+	if (strongsPadding) strongsPad(buf);
 	
 	findOffset(buf, &start, &size, 0, &offset);
 

Modified: trunk/src/modules/texts/rawtext4/rawtext4.cpp
===================================================================
--- trunk/src/modules/texts/rawtext4/rawtext4.cpp	2017-04-24 08:50:31 UTC (rev 3455)
+++ trunk/src/modules/texts/rawtext4/rawtext4.cpp	2017-04-24 09:26:34 UTC (rev 3456)
@@ -164,6 +164,7 @@
 
 	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
 	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
+	if (!size1 || !size2) return false;
 	return start1 == start2;
 }