dasher r3521 - in trunk: . Src/DasherCore

[alarson svn gnome org]

Author: alarson
Date: Sat Apr 26 01:02:31 2008
New Revision: 3521
URL: http://svn.gnome.org/viewvc/dasher?rev=3521&view=rev

Log:
Apply patch for #529907 plus resolve some compiler warnings.



Modified:
   trunk/ChangeLog
   trunk/Src/DasherCore/CannaConversionHelper.h
   trunk/Src/DasherCore/PinYinConversionHelper.cpp
   trunk/Src/DasherCore/PinyinParser.cpp

Modified: trunk/Src/DasherCore/CannaConversionHelper.h
==============================================================================
--- trunk/Src/DasherCore/CannaConversionHelper.h	(original)
+++ trunk/Src/DasherCore/CannaConversionHelper.h	Sat Apr 26 01:02:31 2008
@@ -109,11 +109,9 @@
     if(strChar.size() == 0)
      return false;
 
-    int nbun;
     char *pQuery = (char *)strChar.c_str();
 
     unsigned char *buf = (unsigned char *)malloc(sizeof(unsigned char) * BUFSIZE);
-    unsigned char *str_utf8 = (unsigned char *)malloc(sizeof(unsigned char) * BUFSIZE);
 
     char *inbuf = (char *)pQuery;
     char *outbuf = (char *)buf;

Modified: trunk/Src/DasherCore/PinYinConversionHelper.cpp
==============================================================================
--- trunk/Src/DasherCore/PinYinConversionHelper.cpp	(original)
+++ trunk/Src/DasherCore/PinYinConversionHelper.cpp	Sat Apr 26 01:02:31 2008
@@ -12,7 +12,7 @@
 
 #include <fstream>
 #include <iostream>
-
+#include <cstdlib>
 
 
 using namespace Dasher;

Modified: trunk/Src/DasherCore/PinyinParser.cpp
==============================================================================
--- trunk/Src/DasherCore/PinyinParser.cpp	(original)
+++ trunk/Src/DasherCore/PinyinParser.cpp	Sat Apr 26 01:02:31 2008
@@ -21,6 +21,7 @@
 #include "PinyinParser.h"
 
 #include <cstdio>
+#include <cstring>
 #include <string>
 #include <vector>