diff options
| author | Ulf Jasper | 2014-12-17 21:42:23 +0100 |
|---|---|---|
| committer | Ulf Jasper | 2014-12-17 21:42:23 +0100 |
| commit | af2952fb27c17d1aaeacb017ddb4eeacfd88853c (patch) | |
| tree | 399055fdbd19dc5773b9adf0bf2dc88cfbcbf333 /src | |
| parent | c17c864e7a71e267b7496afbe1d7076cca283cd7 (diff) | |
| download | emacs-af2952fb27c17d1aaeacb017ddb4eeacfd88853c.tar.gz emacs-af2952fb27c17d1aaeacb017ddb4eeacfd88853c.zip | |
Partially disabled previous change.
* src/image.c (svg_load): Temporarily disabled filename thing for
not-a-file case as it can cause crashs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/image.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1e10ffd8fcd..455ec1e8387 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2014-12-17 Ulf Jasper <ulf.jasper@web.de> | 1 | 2014-12-17 Ulf Jasper <ulf.jasper@web.de> |
| 2 | 2 | ||
| 3 | Partially disabled previous change. | ||
| 4 | |||
| 5 | * image.c (svg_load): Temporarily disabled filename thing for | ||
| 6 | not-a-file case as it can cause crashs. | ||
| 7 | |||
| 8 | 2014-12-17 Ulf Jasper <ulf.jasper@web.de> | ||
| 9 | |||
| 3 | Fix problem with images referenced within svg files. (bug#19373) | 10 | Fix problem with images referenced within svg files. (bug#19373) |
| 4 | 11 | ||
| 5 | * image.c: Additional parameter 'filename' for | 12 | * image.c: Additional parameter 'filename' for |
diff --git a/src/image.c b/src/image.c index 0bebd45d893..954d66424d1 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -8823,8 +8823,10 @@ svg_load (struct frame *f, struct image *img) | |||
| 8823 | return 0; | 8823 | return 0; |
| 8824 | } | 8824 | } |
| 8825 | original_filename = BVAR (current_buffer, filename); | 8825 | original_filename = BVAR (current_buffer, filename); |
| 8826 | /* FIXME: disabled the filename thing for the time being as it | ||
| 8827 | can cause crashs. */ | ||
| 8826 | success_p = svg_load_image (f, img, SDATA (data), SBYTES (data), | 8828 | success_p = svg_load_image (f, img, SDATA (data), SBYTES (data), |
| 8827 | SDATA(original_filename)); | 8829 | NULL /* SDATA(original_filename) */); |
| 8828 | } | 8830 | } |
| 8829 | 8831 | ||
| 8830 | return success_p; | 8832 | return success_p; |