Commit c6ae55e8 authored by Jørgen Lind's avatar Jørgen Lind
Browse files

Merge branch feature/jorgen.lind/e2a_table with refs/heads/master into...

Merge branch feature/jorgen.lind/e2a_table with refs/heads/master into refs/merge-requests/497/train
parents 8227427d 3450433f
Pipeline #77970 passed with stages
in 20 minutes and 29 seconds
......@@ -336,41 +336,26 @@ bool autoDetectSEGYTextHeaderIsEBCDIC(const void* buffer, size_t bufferSize)
size_t convertSEGYEBCDICHeaderToASCII(const void* inputBuffer, size_t inputBufferSize, char* outputBuffer, size_t outputBufferSize, int columnWidth)
{
static const char ebcdicToAscii[256] =
static const uint8_t ebcdicToAscii[256] =
{
/* 0*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 8*/ 0, 0, 0, 0, 0, '\r', 0, 0,
/* 16*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 24*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 32*/ 0, 0, 0, 0, 0, '\n', 0, 0,
/* 40*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 48*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 56*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 64*/ ' ', 0, 0, 0, 0, 0, 0, 0,
/* 72*/ 0, 0, 0, '.', '<', '(', '+', 0,
/* 80*/ '&', 0, 0, 0, 0, 0, 0, 0,
/* 88*/ 0, 0, '!', '$', '*', ')', ';', 0,
/* 96*/ '-', '/', 0, 0, 0, 0, 0, 0,
/* 104*/ 0, 0, '|', ',', '%', '_', '>', '?',
/* 112*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 120*/ 0, 0, ':', '#', '@', '\'', '=', '"',
/* 128*/ 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
/* 136*/ 'h', 'i', 0, 0, 0, 0, 0, 0,
/* 144*/ 0, 'j', 'k', 'l', 'm', 'n', 'o', 'p',
/* 152*/ 'q', 'r', 0, 0, 0, 0, 0, 0,
/* 160*/ 0, '~', 's', 't', 'u', 'v', 'w', 'x',
/* 168*/ 'y', 'z', 0, 0, 0, 0, 0, 0,
/* 176*/ 0, 0, 0, 0, 0, 0, 0, 0,
/* 184*/ 0, '`', 0, 0, 0, 0, 0, 0,
/* 192*/ '{', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
/* 200*/ 'H', 'I', 0, 0, 0, 0, 0, 0,
/* 208*/ '}', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
/* 216*/ 'Q', 'R', 0, 0, 0, 0, 0, 0,
/* 224*/ '\\', 0, 'S', 'T', 'U', 'V', 'W', 'X',
/* 232*/ 'Y', 'Z', 0, 0, 0, 0, 0, 0,
/* 240*/ '0', '1', '2', '3', '4', '5', '6', '7',
/* 248*/ '8', '9', 0, 0, 0, 0, 0, 0,
0, 1, 2, 3,156, 9,134,127,151,141,142, 11, 12, 13, 14, 15,
16, 17, 18, 19,157,133, 8,135, 24, 25,146,143, 28, 29, 30, 31,
128,129,130,131,132, 10, 23, 27,136,137,138,139,140, 5, 6, 7,
144,145, 22,147,148,149,150, 4,152,153,154,155, 20, 21,158, 26,
32,160,161,162,163,164,165,166,167,168, 91, 46, 60, 40, 43, 33,
38,169,170,171,172,173,174,175,176,177, 93, 36, 42, 41, 59, 94,
45, 47,178,179,180,181,182,183,184,185,124, 44, 37, 95, 62, 63,
186,187,188,189,190,191,192,193,194, 96, 58, 35, 64, 39, 61, 34,
195, 97, 98, 99,100,101,102,103,104,105,196,197,198,199,200,201,
202,106,107,108,109,110,111,112,113,114,203,204,205,206,207,208,
209,126,115,116,117,118,119,120,121,122,210,211,212,213,214,215,
216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,
123, 65, 66, 67, 68, 69, 70, 71, 72, 73,232,233,234,235,236,237,
125, 74, 75, 76, 77, 78, 79, 80, 81, 82,238,239,240,241,242,243,
92,159, 83, 84, 85, 86, 87, 88, 89, 90,244,245,246,247,248,249,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,250,251,252,253,254,255
};
if (outputBuffer >= inputBuffer && outputBuffer < ((const char*)inputBuffer) + inputBufferSize)
{
fprintf(stderr, "Overlapping input and output buffer.");
......
......@@ -1516,7 +1516,7 @@ main(int argc, char* argv[])
options.add_option("", "", "uniqueID", "Generate a new globally unique ID when scanning the input SEG-Y file.", cxxopts::value<bool>(uniqueID), "");
options.add_option("", "", "disable-persistentID", "Disable the persistentID usage, placing the VDS directly into the url location.", cxxopts::value<bool>(disablePersistentID), "");
options.add_option("", "", "json-output", "Enable json output.", cxxopts::value<bool>(jsonOutput), "");
options.add_option("", "", "print-text-header", "Print the text header of the input segy file and exit.", cxxopts::value<bool>(printSegyTextHeader), "");
options.add_option("", "", "print-text-header", "Print the text header of the input segy file.", cxxopts::value<bool>(printSegyTextHeader), "");
// TODO add option for turning off traceOrderByOffset
options.add_option("", "h", "help", "Print this help information", cxxopts::value<bool>(help), "");
......@@ -1753,7 +1753,8 @@ main(int argc, char* argv[])
memcpy(&output[0], inputData.get(), 3200);
}
fwrite(output.data(), 1, output.size(), stdout);
fprintf(stderr, "\n");
if (url.empty())
return EXIT_SUCCESS;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment