Skip to content

Commit

Permalink
Fixed base64 image encoding.
Browse files Browse the repository at this point in the history
  • Loading branch information
sbarex committed Jan 21, 2021
1 parent 8096e30 commit 2c27bb5
Show file tree
Hide file tree
Showing 9 changed files with 483 additions and 54 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog
=======
### 1.0b18
Bugfix:
- Fixed base64 image encoding.

### 1.0b17
Bugfix:
Expand Down
40 changes: 36 additions & 4 deletions QLMarkdown.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@
836B7475259E2B4100A6A5F7 /* magic.mgc in Resources */ = {isa = PBXBuildFile; fileRef = 836B7474259E2B4000A6A5F7 /* magic.mgc */; };
836B747D259E2D7B00A6A5F7 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836B747C259E2D7B00A6A5F7 /* AboutViewController.swift */; };
836B747E259E2D7B00A6A5F7 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836B747C259E2D7B00A6A5F7 /* AboutViewController.swift */; };
83720A2825B8E93D00B49FEC /* decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 83720A2025B8E93D00B49FEC /* decode.c */; };
83720A2925B8E93D00B49FEC /* encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 83720A2125B8E93D00B49FEC /* encode.c */; };
83720A3625B8EA6000B49FEC /* encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 83720A2125B8E93D00B49FEC /* encode.c */; };
83720A3925B8EA6600B49FEC /* decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 83720A2025B8E93D00B49FEC /* decode.c */; };
83720A4725B8EA9700B49FEC /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 83720A1D25B8E93D00B49FEC /* buffer.c */; };
83720A4A25B8EA9700B49FEC /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 83720A1D25B8E93D00B49FEC /* buffer.c */; };
83760301258C1813004799ED /* inlineimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 83760300258C1813004799ED /* inlineimage.c */; };
83760302258C1813004799ED /* inlineimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 83760300258C1813004799ED /* inlineimage.c */; };
837D20D6258362A5008FC698 /* example.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 837D20D5258362A5008FC698 /* example.jpg */; };
Expand Down Expand Up @@ -364,6 +370,12 @@
836B720A259E226F00A6A5F7 /* wrapper_highlight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrapper_highlight.h; sourceTree = "<group>"; };
836B7474259E2B4000A6A5F7 /* magic.mgc */ = {isa = PBXFileReference; lastKnownFileType = file; path = magic.mgc; sourceTree = BUILT_PRODUCTS_DIR; };
836B747C259E2D7B00A6A5F7 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
83720A1D25B8E93D00B49FEC /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buffer.c; sourceTree = "<group>"; };
83720A1E25B8E93D00B49FEC /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
83720A1F25B8E93D00B49FEC /* b64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = b64.h; sourceTree = "<group>"; };
83720A2025B8E93D00B49FEC /* decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decode.c; sourceTree = "<group>"; };
83720A2125B8E93D00B49FEC /* encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = encode.c; sourceTree = "<group>"; };
83720A2225B8E93D00B49FEC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
837602FF258C1813004799ED /* inlineimage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inlineimage.h; sourceTree = "<group>"; };
83760300258C1813004799ED /* inlineimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = inlineimage.c; sourceTree = "<group>"; };
837D20D5258362A5008FC698 /* example.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = example.jpg; sourceTree = "<group>"; };
Expand Down Expand Up @@ -545,6 +557,7 @@
83327D1D2593FB0700E76CF6 /* url.hpp */,
83C44B3C259A70EE004C1367 /* string_utils.cpp */,
83C44B3D259A70EE004C1367 /* string_utils.hpp */,
83720A1C25B8E93D00B49FEC /* b64.c */,
83327D252594066300E76CF6 /* MIMEtype */,
83598E7825818828004664D3 /* extensions */,
83598E762581881B004664D3 /* src */,
Expand Down Expand Up @@ -682,6 +695,19 @@
name = Products;
sourceTree = "<group>";
};
83720A1C25B8E93D00B49FEC /* b64.c */ = {
isa = PBXGroup;
children = (
83720A1D25B8E93D00B49FEC /* buffer.c */,
83720A1E25B8E93D00B49FEC /* LICENSE */,
83720A1F25B8E93D00B49FEC /* b64.h */,
83720A2025B8E93D00B49FEC /* decode.c */,
83720A2125B8E93D00B49FEC /* encode.c */,
83720A2225B8E93D00B49FEC /* README.md */,
);
path = b64.c;
sourceTree = "<group>";
};
837F29172597A01F00A5F7DE /* Resources */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -878,6 +904,7 @@
83327D222593FCEC00E76CF6 /* url.cpp in Sources */,
831A8CA5258ABDDB00E36182 /* xml.c in Sources */,
831A8C9F258ABDD500E36182 /* html.c in Sources */,
83720A3625B8EA6000B49FEC /* encode.c in Sources */,
831A8C80258ABDAC00E36182 /* cmark_ctype.c in Sources */,
831A8C86258ABDB600E36182 /* commonmark.c in Sources */,
831A8C99258ABDD400E36182 /* plaintext.c in Sources */,
Expand All @@ -887,11 +914,13 @@
83C44B41259A71F4004C1367 /* string_utils.cpp in Sources */,
83F8825F25991BFC008C5071 /* heads_utils.cpp in Sources */,
83F8825A259906C7008C5071 /* heads.c in Sources */,
83720A3925B8EA6600B49FEC /* decode.c in Sources */,
831A8C62258ABD7F00E36182 /* table.c in Sources */,
834D64A9259E9DC400DCA121 /* NSColor+ext.swift in Sources */,
831A8C97258ABDD400E36182 /* linked_list.c in Sources */,
831A8C77258ABD9D00E36182 /* blocks.c in Sources */,
831A8C5C258ABD6F00E36182 /* ext_scanners.c in Sources */,
83720A4725B8EA9700B49FEC /* buffer.c in Sources */,
831A8C8C258ABDBE00E36182 /* footnotes.c in Sources */,
831A8C9C258ABDD500E36182 /* plugin.c in Sources */,
831A8CBE258AC0D200E36182 /* arena.c in Sources */,
Expand Down Expand Up @@ -954,6 +983,7 @@
8357EB782587DBED002C2C45 /* ThemesViewController.swift in Sources */,
83598E902581883B004664D3 /* tasklist.c in Sources */,
83327D462595E15700E76CF6 /* Settings+ext.swift in Sources */,
83720A2925B8E93D00B49FEC /* encode.c in Sources */,
83598EEB2581884D004664D3 /* buffer.c in Sources */,
83598E8F2581883B004664D3 /* table.c in Sources */,
83598E8C2581883B004664D3 /* autolink.c in Sources */,
Expand Down Expand Up @@ -988,9 +1018,11 @@
83598EE62581884D004664D3 /* node.c in Sources */,
838109C725840429000AFE3C /* checkbox.c in Sources */,
83598E912581883B004664D3 /* core-extensions.c in Sources */,
83720A4A25B8EA9700B49FEC /* buffer.c in Sources */,
8357EB7C2587F8EB002C2C45 /* Theme.swift in Sources */,
83598EE22581884D004664D3 /* arena.c in Sources */,
83EF951D2585367500B56FA3 /* NSColor+ext.swift in Sources */,
83720A2825B8E93D00B49FEC /* decode.c in Sources */,
8357EB7F2588262C002C2C45 /* String+ext.swift in Sources */,
838109C3258403CA000AFE3C /* mention.c in Sources */,
);
Expand Down Expand Up @@ -1059,7 +1091,7 @@
CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = NO;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -1095,7 +1127,7 @@
CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = NO;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -1250,7 +1282,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -1295,7 +1327,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down
21 changes: 21 additions & 0 deletions cmark-gfm/b64.c/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Little Star Media, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
83 changes: 83 additions & 0 deletions cmark-gfm/b64.c/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
b64.c
=====

Base64 encode/decode

## install

```sh
$ clib install littlstar/b64.c
```

## usage

```c
#include <b64/b64.h>
```

or

```c
#include <b64.h>
```

```c

#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "b64.h"

int
main (void) {
unsigned char *str = "brian the monkey and bradley the kinkajou are friends";
char *enc = b64_encode(str, strlen(str));

printf("%s\n", enc); // YnJpYW4gdGhlIG1vbmtleSBhbmQgYnJhZGxleSB0aGUga2lua2Fqb3UgYXJlIGZyaWVuZHM=

char *dec = b64_decode(enc, strlen(enc));

printf("%s\n", dec); // brian the monkey and bradley the kinkajou are friends
free(enc);
free(dec);
return 0;
}
```
## api
Base64 index table
```c
static const char b64_table[] = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
'w', 'x', 'y', 'z', '0', '1', '2', '3',
'4', '5', '6', '7', '8', '9', '+', '/'
};
```

Encode `unsigned char *` source with `size_t` size.
Returns a `char *` base64 encoded string

```c
char *
b64_encode (const unsigned char *, size_t);
```
Decode `char *` source with `size_t` size.
Returns a `unsigned char *` base64 decoded string
```c
unsigned char *
b64_decode (const char *, size_t);
```

## license

MIT
79 changes: 79 additions & 0 deletions cmark-gfm/b64.c/b64.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@

/**
* `b64.h' - b64
*
* copyright (c) 2014 joseph werle
*/

#ifndef B64_H
#define B64_H 1

/**
* Memory allocation functions to use. You can define b64_malloc and
* b64_realloc to custom functions if you want.
*/

#ifndef b64_malloc
# define b64_malloc(ptr) malloc(ptr)
#endif
#ifndef b64_realloc
# define b64_realloc(ptr, size) realloc(ptr, size)
#endif

// How much memory to allocate per buffer
#define B64_BUFFER_SIZE (1024 * 64) // 64K

// Start buffered memory
char* b64_buf_malloc(void);

// Update memory size. Returns the same pointer if we
// have enough space in the buffer. Otherwise, we add
// additional buffers.
char* b64_buf_realloc(unsigned char* ptr, size_t size);

/**
* Base64 index table.
*/

static const char b64_table[] = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
'w', 'x', 'y', 'z', '0', '1', '2', '3',
'4', '5', '6', '7', '8', '9', '+', '/'
};

#ifdef __cplusplus
extern "C" {
#endif

/**
* Encode `unsigned char *' source with `size_t' size.
* Returns a `char *' base64 encoded string.
*/

char *
b64_encode (const unsigned char *, size_t);

/**
* Decode `char *' source with `size_t' size.
* Returns a `unsigned char *' base64 decoded string.
*/
unsigned char *
b64_decode (const char *, size_t);

/**
* Decode `char *' source with `size_t' size.
* Returns a `unsigned char *' base64 decoded string + size of decoded string.
*/
unsigned char *
b64_decode_ex (const char *, size_t, size_t *);

#ifdef __cplusplus
}
#endif

#endif
34 changes: 34 additions & 0 deletions cmark-gfm/b64.c/buffer.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#include <stdlib.h>
#include <ctype.h>
#include "b64.h"

#ifdef b64_USE_CUSTOM_MALLOC
extern void* b64_malloc(size_t);
#endif

#ifdef b64_USE_CUSTOM_REALLOC
extern void* b64_realloc(void*, size_t);
#endif

// The number of buffers we need
int bufc = 0;

char* b64_buf_malloc()
{
char* buf = b64_malloc(B64_BUFFER_SIZE);
bufc = 1;
return buf;
}

char* b64_buf_realloc(unsigned char* ptr, size_t size)
{
if (size > bufc * B64_BUFFER_SIZE)
{
while (size > bufc * B64_BUFFER_SIZE) bufc++;
char* buf = b64_realloc(ptr, B64_BUFFER_SIZE * bufc);
if (!buf) return NULL;
return buf;
}

return ptr;
}
Loading

0 comments on commit 2c27bb5

Please sign in to comment.