Merge remote-tracking branch 'siskin/master'

Author: Oldes

make/rebol3.nest

@@ -258,7 +258,7 @@ mezz-lib-files: [
 ;	%mezz/codec-html-entities.reb
 ;	%mezz/codec-wav.reb
 ;	%mezz/codec-swf.reb
-;	%mezz/codec-image.reb ; included using: include-image-os-codec (windows only so far)
+;	%mezz/codec-image.reb ; included using: include-image-os-codec (windows and macos only so far)
 ;	%mezz/codec-image-ext.reb ; image codec extensions (codecs/png/size?)
 ]
 mezz-prot-files: [
@@ -329,20 +329,18 @@ include-native-gif-codec: [config: INCLUDE_GIF_CODEC core-files: %core/u-gif.c]
 
 ;@@ on Windows it's better to use system image codec (ability to use more types)
 include-image-os-codec: [
+	config: INCLUDE_IMAGE_OS_CODEC
+	mezz-lib-files: %mezz/codec-image.reb
 	#if Windows? [
-		config: INCLUDE_IMAGE_OS_CODEC
 		host-files: %os/win32/host-image.c
-		mezz-lib-files: %mezz/codec-image-win.reb
 	]
 	#if MacOS? [
-		config: INCLUDE_IMAGE_OS_CODEC
 		host-files: [
 			%os/osx/host-image.c
 			%os/osx/sys-codecs.m
 			%os/osx/sys-utils.m
 		]
 		frameworks: [CoreGraphics CoreImage ImageIO Foundation]
-		mezz-lib-files: %mezz/codec-image-osx.reb
 	]
 ]
 
@@ -495,7 +493,7 @@ include-codec-bbcode:        [mezz-lib-files:  %mezz/codec-bbcode.reb       ]
 include-codec-html-entities: [mezz-lib-files:  %mezz/codec-html-entities.reb]
 include-codec-ico: [
 	; at this moment ico can be encoded only from pngs!
-	:include-native-png-codec 
+	;:include-native-png-codec 
 	mezz-lib-files: %mezz/codec-ico.reb
 	mezz-lib-files: %mezz/codec-image-ext.reb ; png/size? function
 ]
@@ -538,10 +536,11 @@ include-rebol-core: [
 	:include-iconv
 	:include-https
 
+	:include-codec-unixtime
 	:include-codec-gzip
 	:include-codec-zip
 	:include-codec-tar
-	:include-codec-unixtime
+	
 	config: INCLUDE_SHA224
 	config: INCLUDE_SHA384
 
@@ -551,23 +550,24 @@ include-rebol-core: [
 include-rebol-bulk: [
 	:include-rebol-core
 	:include-optional-checksums
-	:include-image-codecs
 	:include-image-natives
 	:include-lzma-compression
 	:include-base85-encoding
 	:include-view
 	:include-midi
 
+	:include-codec-swf
 	:include-codec-gzip
 	:include-codec-zip
 	:include-codec-tar
 	:include-codec-bbcode
-	:include-codec-html-entities
-	:include-codec-ico
+	:include-codec-html-entities	
 	:include-codec-json
 	:include-codec-xml
-	:include-codec-swf
 	:include-codec-wav
+	:include-codec-ico
+
+	:include-image-codecs
 
 	:include-mezz-date
 	:include-mezz-colors

src/boot/sysobj.reb

@@ -176,6 +176,7 @@ standard: object [
 
 	codec: construct [
 		name:       ;word!
+		type:       ;word!
 		title:      ;string!
 		suffixes:   ;block!
 		decode:     ;[any-function! none!]

src/core/m-pools.c

@@ -411,11 +411,7 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 #endif
 	} else {
 		if (powerof2) {
-			// !!! WHO added this and why??? Just use a left shift and mask!
-			REBCNT len=2048;
-			while(len<length)
-				len*=2;
-			length=len;
+			U32_ROUND_UP_POWER_OF_2(length);
 		} else
 			length = ALIGN(length, 2048);
 #ifdef DEBUGGING

src/include/reb-c.h

@@ -306,6 +306,16 @@ typedef void(*CFUNC)(void *);
 
 #define ROUND_TO_INT(d) (REBINT)(floor((d) + 0.5))
 
+// https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+// Note: 32bit, v must be > 0
+#define U32_ROUND_UP_POWER_OF_2(v) \
+                    v--;           \
+                    v |= v >> 1;   \
+                    v |= v >> 2;   \
+                    v |= v >> 4;   \
+                    v |= v >> 8;   \
+                    v |= v >> 16;  \
+                    v++;           \
 
 /***********************************************************************
 **

src/mezz/base-defs.reb

@@ -51,16 +51,20 @@ decode-url: none ; set in sys init
 
 foreach [codec handler] system/codecs [
 	if handle? handler [
-		; Change boot handle into object:
-		codec: set codec make object! [
-			entry: handler
-			title: form reduce ["Internal codec for" codec "media type"]
+		; Change boot handle (for internal native codecs) into object:
+		codec: set codec make object! [			
 			name: codec
-			type: 'image!
+			type: switch codec [
+				text markup      ['text ]
+				gif bmp jpeg png ['image]
+				wav              ['sound]
+			]
+			title: form reduce ["Internal codec for" codec "media type"]
 			suffixes: select [
-				text [%.txt]
-				markup [%.html %.htm %.xsl %.wml %.sgml %.asp %.php %.cgi]
+				text [%.txt %.cgi]
+				markup [%.html %.htm %.xsl %.wml %.sgml %.asp %.php]
 			] codec
+			entry: handler
 		]
 		; Media-types block format: [.abc .def type ...]
 		if codec/suffixes [ ;append to file-types only if there is any suffix

src/mezz/codec-bbcode.reb

@@ -427,6 +427,7 @@ bbcode: func [
 
 register-codec [
 	name:  'bbcode
+	type:  'text
 	title: "Bulletin Board Code"
 	suffixes: [%.bbcode]
 

src/mezz/codec-crt.reb

@@ -7,6 +7,7 @@ REBOL [
 
 register-codec [
 	name:  'crt
+	type:  'cryptography
 	title: "Internet X.509 Public Key Infrastructure Certificate and Certificate Revocation List (CRL) Profile"
 	suffixes: [%.crt]
 	decode: wrap [

src/mezz/codec-der.reb

@@ -18,6 +18,7 @@ REBOL [
 
 register-codec [
 	name:  'der
+	type:  'cryptography
 	title: "Distinguished Encoding Rules"
 	suffixes: [%.p12 %.pfx %.cer %.der %.jks]
 	decode: function[data [binary!]][
@@ -332,6 +333,7 @@ register-codec [
 
 register-codec [
 	name:  'mobileprovision
+	type:  'cryptography
 	title: "Apple's mobileprovision file"
 	suffixes: [%.mobileprovision]
 	decode: function[data [binary!]][

src/mezz/codec-gzip.reb

@@ -8,6 +8,7 @@ REBOL [
 
 register-codec [
 	name:  'gzip
+	type:  'compression
 	title: "Lossless compressed data format compatible with GZIP utility."
 	suffixes: [%.gz]
 	decode: function[data [binary!]] [

src/mezz/codec-html-entities.reb

@@ -278,6 +278,7 @@ digits:    charset [#"0" - #"9"]
 
 register-codec [
 	name:  'html-entities
+	type:  'text
 	title: "Reserved characters in HTML"
 
 	decode: func [

src/mezz/codec-ico.reb

@@ -9,6 +9,7 @@ REBOL [
 system/options/log/ico: 2
 register-codec [
 	name:  'ico
+	type:  'image
 	title: "Windows icon or cursor file"
 	suffixes: [%.ico %.cur]