Skip to content

Commit

Permalink
JPG Debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
arredgroup committed Jun 29, 2016
1 parent 31c3d23 commit f9d3491
Show file tree
Hide file tree
Showing 62 changed files with 1,748 additions and 262,330 deletions.
Binary file modified .DS_Store
100644 → 100755
Binary file not shown.
2 changes: 1 addition & 1 deletion MakefileOSX
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
all:
g++ -o simlit main.cpp -O2 -lm -lpthread -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -Wall -std=c++11
g++ -o simlit main.cpp -O2 -lm -lpthread -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -Wall -std=c++11
2 changes: 1 addition & 1 deletion arguments.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define TURNER_MIX "turner-mixer"
#define DSJAL_MIX "dsjal-mixer"
#define FILE_MIX "file-mixer"
#define JPG "jpg-compressor"
#define JPG_COMPRESSOR "jpg-compressor"

#define PACKETIZER_METHOD "-packetizer-method"
#define NORMAL_PACKETIZER "normal-packetizer"
Expand Down
Binary file modified class/.DS_Store
100644 → 100755
Binary file not shown.
Empty file modified class/CImg.h
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions class/ChannelSimulator/ChannelFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ChannelFile: public Channel{
* @brief Constructor de la clase Erlang
* @param ext argumentos que serán asignados al simulador
*/
this->setExtras(extras);
setExtras(extras);
}

vector<Package> simulate(vector<Package> list){
Expand All @@ -36,7 +36,7 @@ class ChannelFile: public Channel{
* @return list;
*/
ifstream fp;
if(this->getExtras().size()==0){
if(getExtras().size()==0){
cout << "File hasn't especific\n";
return list;
}
Expand Down
1 change: 0 additions & 1 deletion class/DataBlock.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ class DataBlock: public DataType{
}
}


void* getExtras(){
/**
* @brief Método que Obtiene el los Datos del Bloque
Expand Down
84 changes: 84 additions & 0 deletions class/DataByteStream.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/**
@file DataByte.h
@class DataByte
@brief Clase que representa un Byte de Información
@author Christopher Arredondo Flores
@date 28/9/2014
**/
#ifndef CLASS_DATABYTESTREAM
#define CLASS_DATABYTESTREAM

#include <iostream>
#include "DataType.h"

using namespace std;

class DataByteStream: public DataType{

unsigned char* element; //!<@brief Elemento que Compone al Byte
int bytes;

public:

DataByteStream(unsigned char* nElement, int nBytes){
/**
* @brief Constructor de la Clase DataBlock
* @param nBlock Píxeles que contiene un DataBlock
* @param w Ancho del Bloque
* @param h Alto del Bloque
* @param nAmount Cantidad de Canales que tendrá el bloque
*
*/
bytes = nBytes;
element = nElement;
this->setValid(true);
}


DataByteStream(){
/**
* @brief Constructor de la Clase DataBlock
*/
element = NULL;
bytes = 0;
this->setValid(false);
}

~DataByteStream(){
}

double getSize(){
/*
* @brief Método que devuelve el tamaño del Elemento
* @return result
*/
double size = (double)bytes+0.0;
return size;
}

int* getContent(){
/**
* @brief Función que devuelve en un arreglo de enteros todo el contenido de DataBlock
* return array
*/
int* array = (int*)malloc(sizeof(int));
if(this->isValid()){
array[0]=0;
}
else{
array[0]=1;
}
return array;
}

void* getExtras(){
/**
* @brief Método que Obtiene el Dato del Byte
*/
return (void*)element;
}

};

#endif
Empty file modified class/ForwardProcessing/.DS_Store
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions class/ForwardProcessing/DsjalMixer.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ class DsjalMixer: public ForwardProcessing{
DataType * aux;
_h_=0;
_w_=0;
int height = header->h;
int width = header->w;
int width = (header->w)/(header->wb);
int height = (header->h)/(header->hb);
int indexH[(height*width)];
int indexW[(height*width)];
for (int i = 0, k=0; i < height; i=i+1)
Expand Down
Loading

0 comments on commit f9d3491

Please sign in to comment.