Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed C & C++ compatibility #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed C & C++ compatibility #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd62854
Fixed compatibility between C & C++
monoamine11231 Dec 16, 2022
7fcceab
renamed dir
monoamine11231 Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 cpp/README.md → c-cpp/README.md
View file
Open in desktop
File renamed without changes.
46 changes: 27 additions & 19 deletions cpp/mixbox.cpp → c-cpp/mixbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@

#include "mixbox.h"

#include <cmath>
#ifdef __cplusplus
#include <cmath>
// For pow instead of std::pow
using namespace std;
#else
#include <math.h>
#endif

#ifdef _MSC_VER
#define INLINE __forceinline
Expand All @@ -66,12 +72,12 @@ INLINE static float clamp01(float x)

INLINE static float srgb_to_linear(float x)
{
return (x >= 0.04045f) ? std::pow((x + 0.055f) / 1.055f, 2.4f) : x/12.92f;
return (x >= 0.04045f) ? pow((x + 0.055f) / 1.055f, 2.4f) : x/12.92f;
}

INLINE static float linear_to_srgb(float x)
{
return (x >= 0.0031308f) ? 1.055f*std::pow(x, 1.0f/2.4f) - 0.055f : 12.92f*x;
return (x >= 0.0031308f) ? 1.055f*pow(x, 1.0f/2.4f) - 0.055f : 12.92f*x;
}

INLINE static void eval_polynomial(float c0, float c1, float c2, float c3, float* rgb)
Expand Down Expand Up @@ -127,13 +133,13 @@ INLINE static void float_rgb_to_latent(float r, float g, float b, mixbox_latent
const float y = g * 63.0f;
const float z = b * 63.0f;

const int ix = int(x);
const int iy = int(y);
const int iz = int(z);
const int ix = (int)x;
const int iy = (int)y;
const int iz = (int)z;

const float tx = x - float(ix);
const float ty = y - float(iy);
const float tz = z - float(iz);
const float tx = x - (float)ix;
const float ty = y - (float)iy;
const float tz = z - (float)iz;

const unsigned char* const lut_ptr = &(mixbox_lut()[((ix + iy*64 + iz*64*64) & 0x3FFFF) * 3]);

Expand Down Expand Up @@ -189,7 +195,7 @@ INLINE static void latent_to_rgb(mixbox_latent latent, unsigned char* out_r, uns

INLINE static void rgb_to_latent(unsigned char r, unsigned char g, unsigned char b, mixbox_latent out_latent)
{
float_rgb_to_latent(float(r) / 255.0f, float(g) / 255.0f, float(b) / 255.0f, out_latent);
float_rgb_to_latent((float)r / 255.0f, (float)g / 255.0f, (float)b / 255.0f, out_latent);
}

INLINE static void linear_float_rgb_to_latent(float r, float g, float b, mixbox_latent out_latent)
Expand Down Expand Up @@ -373,6 +379,10 @@ struct zhuffman
uint16 value[288];
};

#ifndef __cplusplus
typedef struct zhuffman zhuffman;
#endif

INLINE static int bitreverse16(int n)
{
n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1);
Expand Down Expand Up @@ -450,6 +460,10 @@ struct zbuf
zhuffman z_length, z_distance;
};

#ifndef __cplusplus
typedef struct zbuf zbuf;
#endif

INLINE static unsigned char decode_b85_char(char c)
{
return (c >= 92) ? c - 36 : c - 35;
Expand Down Expand Up @@ -693,13 +707,7 @@ static int decompress(char* obuffer, int olen)

INLINE static const unsigned char* mixbox_lut()
{
struct mixbox_init_t
{
unsigned char lut[64*64*64*3 + 12675];
mixbox_init_t() { decompress((char*)lut, sizeof(lut)); }
};

static const mixbox_init_t decompressed;

return decompressed.lut;
static unsigned char lut[64*64*64*3 + 12675];
decompress((char*)&lut[0], sizeof(lut));
return &lut[0];
}
0 cpp/mixbox.h → c-cpp/mixbox.h
View file
Open in desktop
File renamed without changes.