[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master af2952f: Partially disabled previous change.
From: |
Ulf Jasper |
Subject: |
[Emacs-diffs] master af2952f: Partially disabled previous change. |
Date: |
Wed, 17 Dec 2014 20:43:11 +0000 |
branch: master
commit af2952fb27c17d1aaeacb017ddb4eeacfd88853c
Author: Ulf Jasper <address@hidden>
Commit: Ulf Jasper <address@hidden>
Partially disabled previous change.
* src/image.c (svg_load): Temporarily disabled filename thing for
not-a-file case as it can cause crashs.
---
src/ChangeLog | 7 +++++++
src/image.c | 4 +++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 1e10ffd..455ec1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
2014-12-17 Ulf Jasper <address@hidden>
+ Partially disabled previous change.
+
+ * image.c (svg_load): Temporarily disabled filename thing for
+ not-a-file case as it can cause crashs.
+
+2014-12-17 Ulf Jasper <address@hidden>
+
Fix problem with images referenced within svg files. (bug#19373)
* image.c: Additional parameter 'filename' for
diff --git a/src/image.c b/src/image.c
index 0bebd45..954d664 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8823,8 +8823,10 @@ svg_load (struct frame *f, struct image *img)
return 0;
}
original_filename = BVAR (current_buffer, filename);
+ /* FIXME: disabled the filename thing for the time being as it
+ can cause crashs. */
success_p = svg_load_image (f, img, SDATA (data), SBYTES (data),
- SDATA(original_filename));
+ NULL /* SDATA(original_filename) */);
}
return success_p;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master af2952f: Partially disabled previous change.,
Ulf Jasper <=