Skip to content

Commit

Permalink
Revert "Update mipp"
Browse files Browse the repository at this point in the history 
This reverts commit 70e2ca0.
  • Loading branch information
@FigBug
FigBug committed Feb 22, 2024
1 parent 23f1d21 commit a79dc6e
Show file tree
Hide file tree
Showing 14 changed files with 977 additions and 5,595 deletions.
686 changes: 343 additions & 343 deletions modules/gin/3rdparty/bsdiff/bsdiff.c
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions modules/gin/3rdparty/bsdiff/bsdiff.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* All rights reserved
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted providing that the following conditions
* modification, are permitted providing that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
Expand Down Expand Up @@ -33,11 +33,11 @@

struct bsdiff_stream
{
void* opaque;
void* opaque;

void* (*malloc)(size_t size);
void (*free)(void* ptr);
int (*write)(struct bsdiff_stream* stream, const void* buffer, int size);
void* (*malloc)(size_t size);
void (*free)(void* ptr);
int (*write)(struct bsdiff_stream* stream, const void* buffer, int size);
};

int bsdiff(const uint8_t* old, int64_t oldsize, const uint8_t* newData, int64_t newsize, struct bsdiff_stream* stream);
Expand Down
260 changes: 130 additions & 130 deletions modules/gin/3rdparty/bsdiff/bspatch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* All rights reserved
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted providing that the following conditions
* modification, are permitted providing that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
Expand All @@ -30,71 +30,71 @@

static int64_t offtin(uint8_t *buf)
{
int64_t y;
int64_t y;

y=buf[7]&0x7F;
y=y*256;y+=buf[6];
y=y*256;y+=buf[5];
y=y*256;y+=buf[4];
y=y*256;y+=buf[3];
y=y*256;y+=buf[2];
y=y*256;y+=buf[1];
y=y*256;y+=buf[0];
y=buf[7]&0x7F;
y=y*256;y+=buf[6];
y=y*256;y+=buf[5];
y=y*256;y+=buf[4];
y=y*256;y+=buf[3];
y=y*256;y+=buf[2];
y=y*256;y+=buf[1];
y=y*256;y+=buf[0];

if(buf[7]&0x80) y=-y;
if(buf[7]&0x80) y=-y;

return y;
return y;
}

int bspatch(const uint8_t* old, int64_t oldsize, uint8_t* new, int64_t newsize, struct bspatch_stream* stream)
{
uint8_t buf[8];
int64_t oldpos,newpos;
int64_t ctrl[3];
int64_t i;

oldpos=0;newpos=0;
while(newpos<newsize) {
/* Read control data */
for(i=0;i<=2;i++) {
if (stream->read(stream, buf, 8))
return -1;
ctrl[i]=offtin(buf);
};

/* Sanity-check */
if (ctrl[0]<0 || ctrl[0]>INT_MAX ||
ctrl[1]<0 || ctrl[1]>INT_MAX ||
newpos+ctrl[0]>newsize)
return -1;

/* Read diff string */
if (stream->read(stream, new + newpos, (int)ctrl[0]))
return -1;

/* Add old data to diff string */
for(i=0;i<ctrl[0];i++)
if((oldpos+i>=0) && (oldpos+i<oldsize))
new[newpos+i]+=old[oldpos+i];

/* Adjust pointers */
newpos+=ctrl[0];
oldpos+=ctrl[0];

/* Sanity-check */
if(newpos+ctrl[1]>newsize)
return -1;

/* Read extra string */
if (stream->read(stream, new + newpos, (int)ctrl[1]))
return -1;

/* Adjust pointers */
newpos+=ctrl[1];
oldpos+=ctrl[2];
};

return 0;
uint8_t buf[8];
int64_t oldpos,newpos;
int64_t ctrl[3];
int64_t i;

oldpos=0;newpos=0;
while(newpos<newsize) {
/* Read control data */
for(i=0;i<=2;i++) {
if (stream->read(stream, buf, 8))
return -1;
ctrl[i]=offtin(buf);
};

/* Sanity-check */
if (ctrl[0]<0 || ctrl[0]>INT_MAX ||
ctrl[1]<0 || ctrl[1]>INT_MAX ||
newpos+ctrl[0]>newsize)
return -1;

/* Read diff string */
if (stream->read(stream, new + newpos, (int)ctrl[0]))
return -1;

/* Add old data to diff string */
for(i=0;i<ctrl[0];i++)
if((oldpos+i>=0) && (oldpos+i<oldsize))
new[newpos+i]+=old[oldpos+i];

/* Adjust pointers */
newpos+=ctrl[0];
oldpos+=ctrl[0];

/* Sanity-check */
if(newpos+ctrl[1]>newsize)
return -1;

/* Read extra string */
if (stream->read(stream, new + newpos, (int)ctrl[1]))
return -1;

/* Adjust pointers */
newpos+=ctrl[1];
oldpos+=ctrl[2];
};

return 0;
}

#if defined(BSPATCH_EXECUTABLE)
Expand All @@ -112,83 +112,83 @@ int bspatch(const uint8_t* old, int64_t oldsize, uint8_t* new, int64_t newsize,

static int bz2_read(const struct bspatch_stream* stream, void* buffer, int length)
{
int n;
int bz2err;
BZFILE* bz2;
int n;
int bz2err;
BZFILE* bz2;

bz2 = (BZFILE*)stream->opaque;
n = BZ2_bzRead(&bz2err, bz2, buffer, length);
if (n != length)
return -1;
bz2 = (BZFILE*)stream->opaque;
n = BZ2_bzRead(&bz2err, bz2, buffer, length);
if (n != length)
return -1;

return 0;
return 0;
}

int main(int argc,char * argv[])
{
FILE * f;
int fd;
int bz2err;
uint8_t header[24];
uint8_t *old, *new;
int64_t oldsize, newsize;
BZFILE* bz2;
struct bspatch_stream stream;
struct stat sb;

if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);

/* Open patch file */
if ((f = fopen(argv[3], "r")) == NULL)
err(1, "fopen(%s)", argv[3]);

/* Read header */
if (fread(header, 1, 24, f) != 24) {
if (feof(f))
errx(1, "Corrupt patch\n");
err(1, "fread(%s)", argv[3]);
}

/* Check for appropriate magic */
if (memcmp(header, "ENDSLEY/BSDIFF43", 16) != 0)
errx(1, "Corrupt patch\n");

/* Read lengths from header */
newsize=offtin(header+16);
if(newsize<0)
errx(1,"Corrupt patch\n");

/* Close patch file and re-open it via libbzip2 at the right places */
if(((fd=open(argv[1],O_RDONLY,0))<0) ||
((oldsize=lseek(fd,0,SEEK_END))==-1) ||
((old=malloc(oldsize+1))==NULL) ||
(lseek(fd,0,SEEK_SET)!=0) ||
(read(fd,old,oldsize)!=oldsize) ||
(fstat(fd, &sb)) ||
(close(fd)==-1)) err(1,"%s",argv[1]);
if((new=malloc(newsize+1))==NULL) err(1,NULL);

if (NULL == (bz2 = BZ2_bzReadOpen(&bz2err, f, 0, 0, NULL, 0)))
errx(1, "BZ2_bzReadOpen, bz2err=%d", bz2err);

stream.read = bz2_read;
stream.opaque = bz2;
if (bspatch(old, oldsize, new, newsize, &stream))
errx(1, "bspatch");

/* Clean up the bzip2 reads */
BZ2_bzReadClose(&bz2err, bz2);
fclose(f);

/* Write the new file */
if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,sb.st_mode))<0) ||
(write(fd,new,newsize)!=newsize) || (close(fd)==-1))
err(1,"%s",argv[2]);

free(new);
free(old);

return 0;
FILE * f;
int fd;
int bz2err;
uint8_t header[24];
uint8_t *old, *new;
int64_t oldsize, newsize;
BZFILE* bz2;
struct bspatch_stream stream;
struct stat sb;

if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);

/* Open patch file */
if ((f = fopen(argv[3], "r")) == NULL)
err(1, "fopen(%s)", argv[3]);

/* Read header */
if (fread(header, 1, 24, f) != 24) {
if (feof(f))
errx(1, "Corrupt patch\n");
err(1, "fread(%s)", argv[3]);
}

/* Check for appropriate magic */
if (memcmp(header, "ENDSLEY/BSDIFF43", 16) != 0)
errx(1, "Corrupt patch\n");

/* Read lengths from header */
newsize=offtin(header+16);
if(newsize<0)
errx(1,"Corrupt patch\n");

/* Close patch file and re-open it via libbzip2 at the right places */
if(((fd=open(argv[1],O_RDONLY,0))<0) ||
((oldsize=lseek(fd,0,SEEK_END))==-1) ||
((old=malloc(oldsize+1))==NULL) ||
(lseek(fd,0,SEEK_SET)!=0) ||
(read(fd,old,oldsize)!=oldsize) ||
(fstat(fd, &sb)) ||
(close(fd)==-1)) err(1,"%s",argv[1]);
if((new=malloc(newsize+1))==NULL) err(1,NULL);

if (NULL == (bz2 = BZ2_bzReadOpen(&bz2err, f, 0, 0, NULL, 0)))
errx(1, "BZ2_bzReadOpen, bz2err=%d", bz2err);

stream.read = bz2_read;
stream.opaque = bz2;
if (bspatch(old, oldsize, new, newsize, &stream))
errx(1, "bspatch");

/* Clean up the bzip2 reads */
BZ2_bzReadClose(&bz2err, bz2);
fclose(f);

/* Write the new file */
if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,sb.st_mode))<0) ||
(write(fd,new,newsize)!=newsize) || (close(fd)==-1))
err(1,"%s",argv[2]);

free(new);
free(old);

return 0;
}

#endif
7 changes: 4 additions & 3 deletions modules/gin/3rdparty/bsdiff/bspatch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* All rights reserved
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted providing that the following conditions
* modification, are permitted providing that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
Expand Down Expand Up @@ -32,10 +32,11 @@

struct bspatch_stream
{
void* opaque;
int (*read)(const struct bspatch_stream* stream, void* buffer, int length);
void* opaque;
int (*read)(const struct bspatch_stream* stream, void* buffer, int length);
};

int bspatch(const uint8_t* old, int64_t oldsize, uint8_t* newData, int64_t newsize, struct bspatch_stream* stream);

#endif

29 changes: 15 additions & 14 deletions modules/gin/utilities/gin_texthistory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,30 @@
class TextHistory
{
public:
void setHistoryLimit (int numItems);

void undo();
void redo();
bool canUndo();
bool canRedo();
void setHistoryLimit (int numItems);

void undo();
void redo();
bool canUndo();
bool canRedo();

bool addText (const juce::String&);
const juce::String& getCurrentText();

std::function<void ()> onStateChanged;

private:
juce::String currentText;
juce::String currentText;

struct HistoryItem
{
struct HistoryItem
{
std::vector<uint8_t> forwardPatch;
std::vector<uint8_t> backwardPatch;
};
};

juce::Array<HistoryItem> historyStack;
int stackPointer = -1;
int limit = 100;
juce::Array<HistoryItem> historyStack;
int stackPointer = -1;
int limit = 100;
};
//-------------------------------------------------------------------------------------------------

Loading

0 comments on commit a79dc6e

Please sign in to comment.