summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPRINCE KUMAR DUBEY <prince.dubey@samsung.com>2012-06-14 09:45:48 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-06-14 09:45:48 +0000
commite3c44bee13a5677ff1f6224ed35c7125bce2ea3d (patch)
treea87d73c97ac2515b861665f2118ae9d74d73e771
parent3b3c4d18e19645a7253f9eeb124654b15166304f (diff)
From: PRINCE KUMAR DUBEY <prince.dubey@samsung.com>
Subject: [E-devel] [Patch] [Edje] Fix for seg fault during edje decompilation Fix decompile of sound samples to use sound source file, not name Fix decompile of sound samples not double-free Fix alsa configure option to be alsa, not flac. SVN revision: 72117
-rw-r--r--legacy/edje/ChangeLog7
-rw-r--r--legacy/edje/configure.ac2
-rw-r--r--legacy/edje/src/bin/edje_decc.c3
3 files changed, 9 insertions, 3 deletions
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index e92088c18e..107fc1236e 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -475,3 +475,10 @@
4752012-06-04 Cedric Bail 4752012-06-04 Cedric Bail
476 476
477 * Add SPACER part to reduce the load on the canvas (lighter and faster theme). 477 * Add SPACER part to reduce the load on the canvas (lighter and faster theme).
478
4792012-06-04 Prince Kumar Dubey
480
481 * Fix decompile of sound samples to use sound source file, not name
482 * Fix decompile of sound samples not double-free
483 * Fix alsa configure option to be alsa, not flac.
484
diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac
index 9b7322bc03..de135c342e 100644
--- a/legacy/edje/configure.ac
+++ b/legacy/edje/configure.ac
@@ -396,7 +396,7 @@ fi
396##alsa library 396##alsa library
397have_alsa_lib="no" 397have_alsa_lib="no"
398want_alsa_lib="auto" 398want_alsa_lib="auto"
399AC_ARG_ENABLE([flac], 399AC_ARG_ENABLE([alsa],
400 [AC_HELP_STRING([--disable-alsa], [disable alsa support. @<:@default=detect@:>@])], 400 [AC_HELP_STRING([--disable-alsa], [disable alsa support. @<:@default=detect@:>@])],
401 [want_alsa_lib=$enableval], []) 401 [want_alsa_lib=$enableval], [])
402 402
diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index fd228d7b34..358859e1ef 100644
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -393,7 +393,7 @@ output(void)
393 sound_data = (void *)eet_read_direct(tef, out, &sound_data_size); 393 sound_data = (void *)eet_read_direct(tef, out, &sound_data_size);
394 if (sound_data) 394 if (sound_data)
395 { 395 {
396 snprintf(out1, sizeof(out1), "%s/%s", outdir, sample->name); 396 snprintf(out1, sizeof(out1), "%s/%s", outdir, sample->snd_src);
397 pp = strdup(out1); 397 pp = strdup(out1);
398 p = strrchr(pp, '/'); 398 p = strrchr(pp, '/');
399 *p = 0; 399 *p = 0;
@@ -413,7 +413,6 @@ output(void)
413 if (fwrite(sound_data, sound_data_size, 1, f) != 1) 413 if (fwrite(sound_data, sound_data_size, 1, f) != 1)
414 ERR("Could not write sound: %s", strerror(errno)); 414 ERR("Could not write sound: %s", strerror(errno));
415 fclose(f); 415 fclose(f);
416 free(sound_data);
417 } 416 }
418 } 417 }
419 418