[Gzz-commits] gzz/gfx/jni GzzGL-jni.cxx

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    02/09/27 01:45:14

Modified files:
        gfx/jni        : GzzGL-jni.cxx 

Log message:
        Functions for jstring <-> std::string and jstring <-> unistring
        conversions.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -c gzz/gfx/jni/GzzGL-jni.cxx:1.34 gzz/gfx/jni/GzzGL-jni.cxx:1.35
*** gzz/gfx/jni/GzzGL-jni.cxx:1.34      Wed Sep 25 13:57:56 2002
--- gzz/gfx/jni/GzzGL-jni.cxx   Fri Sep 27 01:45:14 2002
***************
*** 79,98 ****
  
  vector<int> contextStack;
  
! /** Converts java.lang.String to C++ unistring
!  *
!  * typedef std::basic_string<unsigned short> unistring;
   *
   * @param env the JNI interface pointer
-  * @param jstr java.lang.String
-  * @return unistring
   */
  Renderables::unistring jstr2unistr(JNIEnv *env, jstring jstr) {
    const jchar *strptr = env->GetStringChars(jstr, 0);
!   Renderables::unistring unistr(strptr);
!   // FIX PROP: Renderables::unistring unistr(strptr, 
env->GetStringLength(jstr));
    env->ReleaseStringChars(jstr, strptr);
    return unistr;
  }
  
  Os::Window *getWindowByWID(int wid) {
--- 79,111 ----
  
  vector<int> contextStack;
  
! /** Converts jstring to unistring
   *
+  * Unistring type currently defined at 
+  * gzz/gfx/librenderables/Renderables.hxx
+  * 
   * @param env the JNI interface pointer
   */
  Renderables::unistring jstr2unistr(JNIEnv *env, jstring jstr) {
    const jchar *strptr = env->GetStringChars(jstr, 0);
!   Renderables::unistring unistr(strptr, env->GetStringLength(jstr));
    env->ReleaseStringChars(jstr, strptr);
    return unistr;
+ }
+ /** Converts jstring to std::string through UTF-8 transformation */
+ std::string jstr2stdstr(JNIEnv *env, jstring jstr) {
+   const char *strptr = env->GetStringUTFChars(jstr, 0);
+   std::string stdstr(strptr, env->GetStringUTFLength(jstr));
+   env->ReleaseStringUTFChars(jstr, strptr);
+   return stdstr;
+ }
+ /** Converts unistring to jstring */
+ jstring unistr2jstr(JNIEnv *env, Renderables::unistring unistr) {
+   return env->NewString(unistr.data(), unistr.length());
+ }
+ /** Converts std::string to jstring through UTF-8 transformation */
+ jstring stdstr2jstr(JNIEnv *env, std::string stdstr) {
+   return env->NewStringUTF(stdstr.data());
  }
  
  Os::Window *getWindowByWID(int wid) {